diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index cca061142e..fe8d353a01 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,28 +1,71 @@
 <?php
 
-// Exclude cache folder (vendor is already excluded)
+// Exclude cache and docker folders (vendor is already excluded)
 // and model classes generated with Propel.
 $finder = PhpCsFixer\Finder::create()
     ->exclude('.coverage')
     ->exclude('cache')
+    ->notPath('docker/')
     ->notPath('#/model/om/#')
     ->notPath('#/model/map/#')
     ->in(__DIR__)
 ;
 
-// Indentation inside switch blocks and some multiline
-// elements (control statements, assignments, strings)
-// is not considered. See:
-// https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/776
-// https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4502
-//
-// PhpCsFixer's method_argument_space default value,
-// which includes ensure_fully_multiline, causes
-// inconsistencies in templates.
+// method_argument_space, statement_indentation
+/*
+ * Indentation inside switch blocks and some multiline
+ * elements (control statements, assignments, strings)
+ * is not considered. See:
+ * https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/776
+ * https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4502
+ *
+ * PhpCsFixer's method_argument_space default value,
+ * which includes ensure_fully_multiline, causes
+ * inconsistencies in templates.
+ */
+
+// fully_qualified_strict_types
+/*
+ * TODO: Currently the only cases where we don't have fully
+ * qualified strict types is where we reference Elastica,
+ * and having those helps developers quickly find locations
+ * where Elastica is present in the AtoM codebase outside
+ * plugins. When ES is no longer deeply integrated with the
+ * AtoM code base, this rule exception can be removed.
+ */
+
+// string_implicit_backslashes
+/*
+ * This breaks regex strings, and currently there are no
+ * options that distinguish regex strings from regular
+ * strings.
+ */
+
+// no_superfluous_phpdoc_tags
+/*
+ * This removes phpdoc where the function signature already
+ * includes types. Adding this exception since we still
+ * want to retain phpdoc specially if they include a
+ * description.
+ */
+
+// multiline_whitespace_before_semicolons
+/*
+ * This prevents semicolons to be moved to a new line in
+ * cases where there are chained multiline function calls.
+ * Adding this exception since the semicolons in new lines
+ * are not indented.
+ */
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRules([
         '@PhpCsFixer' => true,
         'method_argument_space' => ['on_multiline' => 'ignore'],
+        'statement_indentation' => false,
+        'fully_qualified_strict_types' => false,
+        'string_implicit_backslashes' => false,
+        'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
+        'no_superfluous_phpdoc_tags' => false,
     ])
     ->setFinder($finder)
 ;
diff --git a/apps/qubit/modules/actor/templates/_actions.php b/apps/qubit/modules/actor/templates/_actions.php
index 578dcfef3b..5a650b57cb 100644
--- a/apps/qubit/modules/actor/templates/_actions.php
+++ b/apps/qubit/modules/actor/templates/_actions.php
@@ -2,7 +2,7 @@
 
   <ul>
 
-    <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+    <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
       <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'actor', 'action' => 'edit'], ['class' => 'c-btn c-btn-submit', 'title' => __('Edit')]); ?></li>
     <?php } ?>
 
diff --git a/apps/qubit/modules/actor/templates/_occupations.php b/apps/qubit/modules/actor/templates/_occupations.php
index a8fa77c002..c2984feb6a 100644
--- a/apps/qubit/modules/actor/templates/_occupations.php
+++ b/apps/qubit/modules/actor/templates/_occupations.php
@@ -10,7 +10,8 @@
     </tr>
   </thead><tbody>
 
-    <?php $i = 0; foreach ($occupations as $item) { ?>
+    <?php $i = 0;
+    foreach ($occupations as $item) { ?>
       <?php $form->getWidgetSchema()->setNameFormat("occupations[{$i}][%s]"); ?>
 
       <tr class="<?php echo 0 == $i % 2 ? 'even' : 'odd'; ?> related_obj_<?php echo $item->id; ?>">
diff --git a/apps/qubit/modules/admin/actions/error404Action.class.php b/apps/qubit/modules/admin/actions/error404Action.class.php
index cd0d1b1f0e..4f4aba9892 100644
--- a/apps/qubit/modules/admin/actions/error404Action.class.php
+++ b/apps/qubit/modules/admin/actions/error404Action.class.php
@@ -19,7 +19,5 @@
 
 class AdminError404Action extends sfAction
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
diff --git a/apps/qubit/modules/admin/actions/translatePermissionAction.class.php b/apps/qubit/modules/admin/actions/translatePermissionAction.class.php
index 35ada8ceb4..6749d4557f 100644
--- a/apps/qubit/modules/admin/actions/translatePermissionAction.class.php
+++ b/apps/qubit/modules/admin/actions/translatePermissionAction.class.php
@@ -19,7 +19,5 @@
 
 class AdminTranslatePermissionAction extends sfAction
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
diff --git a/apps/qubit/modules/clipboard/actions/exportAction.class.php b/apps/qubit/modules/clipboard/actions/exportAction.class.php
index ae372edbd8..133cd7ecdd 100644
--- a/apps/qubit/modules/clipboard/actions/exportAction.class.php
+++ b/apps/qubit/modules/clipboard/actions/exportAction.class.php
@@ -83,11 +83,11 @@ public function execute($request)
 
         // Determine if there are non-visible elements that should be hidden
         $this->nonVisibleElementsIncluded = false;
-        $defTemplate = sfConfig::get(('app_default_template_'.strtolower($this->objectType)));
+        $defTemplate = sfConfig::get('app_default_template_'.strtolower($this->objectType));
 
         foreach (sfConfig::getAll() as $setting => $value) {
             if (
-                (false !== strpos($setting, ('app_element_visibility_'.$defTemplate)))
+                (false !== strpos($setting, 'app_element_visibility_'.$defTemplate))
                 && (0 == sfConfig::get($setting))
             ) {
                 $this->nonVisibleElementsIncluded = true;
@@ -338,6 +338,7 @@ protected function addField($name)
                 );
 
                 break;
+
             // Enable field includeDescendants if:
             // options enabled
             // and, information object type
@@ -357,6 +358,7 @@ protected function addField($name)
                 }
 
                 break;
+
             // Enable field includeAllLevels if:
             // options enabled
             // and, information object type
@@ -372,6 +374,7 @@ protected function addField($name)
                 }
 
                 break;
+
             // Enable field levels if:
             // options enabled
             // and, information object type
@@ -405,6 +408,7 @@ protected function addField($name)
                 }
 
                 break;
+
             // Enable field includeDigitalObjects if:
             // digital objects are available
             case 'includeDigitalObjects':
@@ -429,6 +433,7 @@ protected function addField($name)
                 }
 
                 break;
+
             // Enable field includeDrafts if:
             // information object type
             // and, user is authenticated
@@ -451,6 +456,7 @@ protected function addField($name)
                 }
 
                 break;
+
             // Enable field includeNonVisibleElements if:
             // information object type
             // and, user is authenticated
diff --git a/apps/qubit/modules/clipboard/actions/viewAction.class.php b/apps/qubit/modules/clipboard/actions/viewAction.class.php
index 97ba039ace..64c84ade89 100644
--- a/apps/qubit/modules/clipboard/actions/viewAction.class.php
+++ b/apps/qubit/modules/clipboard/actions/viewAction.class.php
@@ -124,6 +124,7 @@ private function setESSort($request)
                 $this->search->query->addSort(['referenceCode.untouched' => $request->sortDir]);
 
                 break;
+
             // Sort by title if information object, go with authorized form of name if repository / actor
             case 'alphabetic':
                 $fieldName = 'QubitInformationObject' === $this->entityType ? 'title' : 'authorizedFormOfName';
diff --git a/apps/qubit/modules/default/actions/fullTreeViewAction.class.php b/apps/qubit/modules/default/actions/fullTreeViewAction.class.php
index b4208adf32..afda1afb1a 100644
--- a/apps/qubit/modules/default/actions/fullTreeViewAction.class.php
+++ b/apps/qubit/modules/default/actions/fullTreeViewAction.class.php
@@ -176,8 +176,7 @@ protected function doElasticsearchQuery($term, $options = [])
         return QubitSearch::getInstance()
             ->index
             ->getType('QubitInformationObject')
-            ->search($query->getQuery(false, false))
-        ;
+            ->search($query->getQuery(false, false));
     }
 
     /**
@@ -239,8 +238,7 @@ protected function countChildren($id, $options = [])
         return QubitSearch::getInstance()
             ->index
             ->getType('QubitInformationObject')
-            ->count($query->getQuery(false, false))
-        ;
+            ->count($query->getQuery(false, false));
     }
 
     /**
diff --git a/apps/qubit/modules/digitalobject/actions/editRepresentationComponent.class.php b/apps/qubit/modules/digitalobject/actions/editRepresentationComponent.class.php
index d0d60d5c5b..16c234929f 100644
--- a/apps/qubit/modules/digitalobject/actions/editRepresentationComponent.class.php
+++ b/apps/qubit/modules/digitalobject/actions/editRepresentationComponent.class.php
@@ -24,7 +24,5 @@
  */
 class DigitalObjectEditRepresentationComponent extends sfComponent
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
diff --git a/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php b/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
index 6de8de178d..87f3121d63 100644
--- a/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
+++ b/apps/qubit/modules/digitalobject/actions/imageflowComponent.class.php
@@ -126,8 +126,7 @@ protected function getDescendantDigitalObjectCount()
         $results = QubitSearch::getInstance()
             ->index
             ->getType('QubitInformationObject')
-            ->search($search->getQuery(false, true))
-        ;
+            ->search($search->getQuery(false, true));
 
         return $results->getTotalHits();
     }
diff --git a/apps/qubit/modules/digitalobject/actions/metadataComponent.class.php b/apps/qubit/modules/digitalobject/actions/metadataComponent.class.php
index b8a2749aeb..34b2bbeae7 100644
--- a/apps/qubit/modules/digitalobject/actions/metadataComponent.class.php
+++ b/apps/qubit/modules/digitalobject/actions/metadataComponent.class.php
@@ -206,8 +206,7 @@ protected function setMasterFileShowProperties()
             || $this->showMasterFileMediaType
             || $this->showMasterFileMimeType
             || $this->showMasterFileSize
-            || $this->showMasterFileCreatedAt
-        ;
+            || $this->showMasterFileCreatedAt;
     }
 
     protected function setReferenceCopyShowProperties()
@@ -320,9 +319,8 @@ protected function setOriginalFileShowProperties()
             check_field_visibility('app_element_visibility_digital_object_preservation_system_original_ingested')
             && !$this->isEmpty($this->originalFileIngestedAt)
         );
-        $this->showOriginalFilePermissions = (
-            check_field_visibility('app_element_visibility_digital_object_preservation_system_original_permissions')
-        );
+        $this->showOriginalFilePermissions =
+            check_field_visibility('app_element_visibility_digital_object_preservation_system_original_permissions');
 
         return $this->showOriginalFileName
             || $this->showOriginalFormatName
@@ -351,9 +349,8 @@ protected function setPreservationCopyShowProperties()
             check_field_visibility('app_element_visibility_digital_object_preservation_system_preservation_normalized')
             && !$this->isEmpty($this->preservationCopyNormalizedAt)
         );
-        $this->showPreservationCopyPermissions = (
-            check_field_visibility('app_element_visibility_digital_object_preservation_system_preservation_permissions')
-        );
+        $this->showPreservationCopyPermissions =
+            check_field_visibility('app_element_visibility_digital_object_preservation_system_preservation_permissions');
 
         return $this->showPreservationCopyFileName
             || $this->showPreservationCopyFileSize
diff --git a/apps/qubit/modules/function/actions/browseAction.class.php b/apps/qubit/modules/function/actions/browseAction.class.php
index 5d64f45f60..fd78f5e349 100644
--- a/apps/qubit/modules/function/actions/browseAction.class.php
+++ b/apps/qubit/modules/function/actions/browseAction.class.php
@@ -73,6 +73,7 @@ public function execute($request)
         switch ($request->sort) {
             case 'identifier':
                 $criteria->{$sortFunction}(QubitFunctionObject::DESCRIPTION_IDENTIFIER);
+
                 // And then back to authorized form of name
                 // no break
             case 'alphabetic':
diff --git a/apps/qubit/modules/informationobject/actions/calculateDatesAction.class.php b/apps/qubit/modules/informationobject/actions/calculateDatesAction.class.php
index 2feef34df9..5a7a19f7ef 100644
--- a/apps/qubit/modules/informationobject/actions/calculateDatesAction.class.php
+++ b/apps/qubit/modules/informationobject/actions/calculateDatesAction.class.php
@@ -92,7 +92,7 @@ public static function getDescendantDateTypes($resource)
 
         foreach ($eventData as $event) {
             $eventTypeTerm = QubitTerm::getById($event['type_id']);
-            $eventTypes[($event['type_id'])] = $eventTypeTerm->getName(['cultureFallback' => true]);
+            $eventTypes[$event['type_id']] = $eventTypeTerm->getName(['cultureFallback' => true]);
         }
 
         return $eventTypes;
diff --git a/apps/qubit/modules/informationobject/actions/findingAidComponent.class.php b/apps/qubit/modules/informationobject/actions/findingAidComponent.class.php
index ada8a11922..a5fc394c8c 100644
--- a/apps/qubit/modules/informationobject/actions/findingAidComponent.class.php
+++ b/apps/qubit/modules/informationobject/actions/findingAidComponent.class.php
@@ -131,6 +131,7 @@ public function execute($request)
                     $this->status = $this->context->i18n->__('Uploaded');
 
                     break;
+
                 // It should never get here if we don't add more finding aid
                 // statuses
                 default:
diff --git a/apps/qubit/modules/informationobject/actions/inventoryAction.class.php b/apps/qubit/modules/informationobject/actions/inventoryAction.class.php
index b2ac645682..5f7c1591e3 100644
--- a/apps/qubit/modules/informationobject/actions/inventoryAction.class.php
+++ b/apps/qubit/modules/informationobject/actions/inventoryAction.class.php
@@ -162,6 +162,7 @@ private static function getResults($resource, $limit = 10, $page = 1, $sort = nu
                 ]);
 
                 break;
+
             // Avoid sorting when we are just counting records
             case null:
                 break;
diff --git a/apps/qubit/modules/informationobject/templates/_actions.php b/apps/qubit/modules/informationobject/templates/_actions.php
index 62dcea1a94..2c569a4876 100644
--- a/apps/qubit/modules/informationobject/templates/_actions.php
+++ b/apps/qubit/modules/informationobject/templates/_actions.php
@@ -1,7 +1,7 @@
 <section class="actions">
   <ul>
 
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'informationobject', 'action' => 'edit'], ['class' => 'c-btn c-btn-submit']); ?></li>
       <?php } ?>
 
@@ -63,9 +63,9 @@
 
               <li class="divider"></li>
 
-              <li><?php echo link_to(__('Create new rights'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
+              <li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
               <?php if ($resource->hasChildren()) { ?>
-                <li><?php echo link_to(__('Manage rights inheritance'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage']); ?></li>
+                <li><?php echo link_to(__('Manage rights inheritance'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage']); ?></li>
               <?php } ?>
 
               <?php if (sfConfig::get('app_audit_log_enabled', false)) { ?>
diff --git a/apps/qubit/modules/informationobject/templates/_alternativeIdentifiers.php b/apps/qubit/modules/informationobject/templates/_alternativeIdentifiers.php
index 024bbe10d0..9c323bc33b 100644
--- a/apps/qubit/modules/informationobject/templates/_alternativeIdentifiers.php
+++ b/apps/qubit/modules/informationobject/templates/_alternativeIdentifiers.php
@@ -13,7 +13,8 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($alternativeIdentifiers as $item) { ?>
+      <?php $i = 0;
+      foreach ($alternativeIdentifiers as $item) { ?>
         <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]"); ?>
 
         <tr class="<?php echo 0 == $i % 2 ? 'even' : 'odd'; ?> related_obj_<?php echo $item->id; ?>">
diff --git a/apps/qubit/modules/informationobject/templates/boxLabelSuccess.php b/apps/qubit/modules/informationobject/templates/boxLabelSuccess.php
index 40b48924bd..219400df34 100644
--- a/apps/qubit/modules/informationobject/templates/boxLabelSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/boxLabelSuccess.php
@@ -37,7 +37,8 @@
         </th>
       </tr>
     </thead><tbody>
-      <?php $row = 1; foreach ($results as $item) { ?>
+      <?php $row = 1;
+      foreach ($results as $item) { ?>
         <tr>
           <td>
             <?php echo $row++; ?>
diff --git a/apps/qubit/modules/informationobject/templates/itemOrFileListSuccess.php b/apps/qubit/modules/informationobject/templates/itemOrFileListSuccess.php
index 775afad770..cb2425ef39 100644
--- a/apps/qubit/modules/informationobject/templates/itemOrFileListSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/itemOrFileListSuccess.php
@@ -17,7 +17,8 @@
 <body>
   <h1 class="label"><?php echo $reportTypeLabel.$this->i18n->__(' report'); ?></h1><hr>
 
-  <?php $row = 1; foreach ($results as $parent => $items) { ?>
+  <?php $row = 1;
+  foreach ($results as $parent => $items) { ?>
     <h2 class="element-invisible"><?php echo $this->i18n->__('%1% hierarchy', ['%1%' => sfConfig::get('app_ui_label_informationobject')]); ?></h2>
     <div class="resource-hierarchy">
       <ul>
diff --git a/apps/qubit/modules/informationobject/templates/storageLocationsSuccess.php b/apps/qubit/modules/informationobject/templates/storageLocationsSuccess.php
index 46f5e9c1b9..0ef6cf89e4 100644
--- a/apps/qubit/modules/informationobject/templates/storageLocationsSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/storageLocationsSuccess.php
@@ -35,7 +35,8 @@
         </th>
       </tr>
     </thead><tbody>
-      <?php $row = 1; foreach ($results as $item) { ?>
+      <?php $row = 1;
+      foreach ($results as $item) { ?>
         <tr>
           <td>
             <?php echo $row++; ?>
diff --git a/apps/qubit/modules/menu/templates/listSuccess.php b/apps/qubit/modules/menu/templates/listSuccess.php
index 33813c10d3..842105ba4d 100644
--- a/apps/qubit/modules/menu/templates/listSuccess.php
+++ b/apps/qubit/modules/menu/templates/listSuccess.php
@@ -23,7 +23,7 @@
         <tr>
           <td<?php if (QubitMenu::ROOT_ID == $item['parentId']) { ?> style="font-weight: bold"<?php } ?>>
 
-            <?php echo str_repeat('&nbsp;&nbsp;', ($item['depth'] - 1)); ?>
+            <?php echo str_repeat('&nbsp;&nbsp;', $item['depth'] - 1); ?>
 
             <?php if (isset($item['prev'])) { ?>
               <?php echo link_to(image_tag('up.gif', ['alt' => __('Move up')]), ['module' => 'menu', 'action' => 'list', 'move' => $item['id'], 'before' => $item['prev']], ['title' => __('Move item up in list')]); ?>
diff --git a/apps/qubit/modules/object/actions/validateCsvAction.class.php b/apps/qubit/modules/object/actions/validateCsvAction.class.php
index 6e0bdebfbe..4c1cda6897 100644
--- a/apps/qubit/modules/object/actions/validateCsvAction.class.php
+++ b/apps/qubit/modules/object/actions/validateCsvAction.class.php
@@ -52,9 +52,7 @@ protected function addField($name)
         return parent::addField($name);
     }
 
-    protected function processField($field)
-    {
-    }
+    protected function processField($field) {}
 
     /**
      * Launch the file import background job and return.
diff --git a/apps/qubit/modules/object/templates/_notes.php b/apps/qubit/modules/object/templates/_notes.php
index ef095e8b4c..05d5be3c07 100644
--- a/apps/qubit/modules/object/templates/_notes.php
+++ b/apps/qubit/modules/object/templates/_notes.php
@@ -19,7 +19,8 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($notes as $item) { ?>
+      <?php $i = 0;
+      foreach ($notes as $item) { ?>
 
         <?php $form->getWidgetSchema()->setNameFormat($arrayName."[{$i}][%s]"); ?>
 
diff --git a/apps/qubit/modules/physicalobject/actions/browseAction.class.php b/apps/qubit/modules/physicalobject/actions/browseAction.class.php
index ea114e53e3..9281e2ab67 100644
--- a/apps/qubit/modules/physicalobject/actions/browseAction.class.php
+++ b/apps/qubit/modules/physicalobject/actions/browseAction.class.php
@@ -29,7 +29,7 @@ public function execute($request)
         }
 
         if (sfConfig::get('app_enable_institutional_scoping')) {
-            //remove search-realm
+            // remove search-realm
             $this->context->user->removeAttribute('search-realm');
         }
 
diff --git a/apps/qubit/modules/physicalobject/templates/boxListSuccess.php b/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
index cf64850570..1c5911a6ce 100644
--- a/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
+++ b/apps/qubit/modules/physicalobject/templates/boxListSuccess.php
@@ -28,7 +28,8 @@
     <?php foreach ($informationObjects as $item) { ?>
       <tr class="<?php echo 0 == @++$row % 2 ? 'even' : 'odd'; ?>">
         <td>
-          <?php $isad = new sfIsadPlugin($item); echo render_value_inline($isad->referenceCode); ?>
+          <?php $isad = new sfIsadPlugin($item);
+          echo render_value_inline($isad->referenceCode); ?>
         </td><td>
           <?php echo render_title($item); ?>
         </td><td>
diff --git a/apps/qubit/modules/right/actions/editAction.class.php b/apps/qubit/modules/right/actions/editAction.class.php
index c6844d01c4..a8f4bde7af 100644
--- a/apps/qubit/modules/right/actions/editAction.class.php
+++ b/apps/qubit/modules/right/actions/editAction.class.php
@@ -68,7 +68,7 @@ protected function addField($name)
     {
         switch ($name) {
             case 'endDate':
-                $this->form->setDefault('endDate', ($this->right->endDate));
+                $this->form->setDefault('endDate', $this->right->endDate);
                 $this->form->setValidator('endDate', new sfValidatorString());
                 $this->form->setWidget('endDate', $this->dateWidget());
                 $this->form->getWidgetSchema()->endDate->setLabel($this->context->i18n->__('End'));
@@ -396,12 +396,12 @@ protected function grantedRightFormSetup($grantedRight)
         $form->setValidator('startDate', new sfValidatorString());
         $form->setWidget('startDate', $this->dateWidget());
         $form->getWidgetSchema()->startDate->setLabel($this->context->i18n->__('Start'));
-        $form->setDefault('startDate', ($grantedRight->startDate));
+        $form->setDefault('startDate', $grantedRight->startDate);
 
         $form->setValidator('endDate', new sfValidatorString());
         $form->setWidget('endDate', $this->dateWidget());
         $form->getWidgetSchema()->endDate->setLabel($this->context->i18n->__('End'));
-        $form->setDefault('endDate', ($grantedRight->endDate));
+        $form->setDefault('endDate', $grantedRight->endDate);
 
         $res_choices[1] = $this->context->i18n->__('Allow');
         $res_choices[2] = $this->context->i18n->__('Conditional');
diff --git a/apps/qubit/modules/rightsholder/actions/browseAction.class.php b/apps/qubit/modules/rightsholder/actions/browseAction.class.php
index b0e4d2584f..f03c85f988 100644
--- a/apps/qubit/modules/rightsholder/actions/browseAction.class.php
+++ b/apps/qubit/modules/rightsholder/actions/browseAction.class.php
@@ -67,6 +67,7 @@ public function execute($request)
         switch ($request->sort) {
             case 'identifier':
                 $criteria->{$sortFunction}(QubitActor::DESCRIPTION_IDENTIFIER);
+
                 // And continue to sort by alphabetic
                 // no break
             case 'alphabetic':
diff --git a/apps/qubit/modules/term/actions/treeViewAction.class.php b/apps/qubit/modules/term/actions/treeViewAction.class.php
index 4957eb4e0a..7a78765e31 100644
--- a/apps/qubit/modules/term/actions/treeViewAction.class.php
+++ b/apps/qubit/modules/term/actions/treeViewAction.class.php
@@ -49,7 +49,7 @@ public function execute($request)
                     array_pop($nextItems);
                 }
 
-                //Merge siblings and self
+                // Merge siblings and self
                 $this->items = array_merge($prevItems, [$this->resource], $nextItems);
 
                 break;
diff --git a/apps/qubit/modules/user/actions/indexActorAclAction.class.php b/apps/qubit/modules/user/actions/indexActorAclAction.class.php
index 340bee8367..38ea4965e7 100644
--- a/apps/qubit/modules/user/actions/indexActorAclAction.class.php
+++ b/apps/qubit/modules/user/actions/indexActorAclAction.class.php
@@ -27,7 +27,7 @@ public function execute($request)
             $this->forward404();
         }
 
-        //except for administrators, only allow users to see their own profile
+        // except for administrators, only allow users to see their own profile
         if (!$this->context->user->isAdministrator()) {
             if ($this->resource->id != $this->context->user->getAttribute('user_id')) {
                 $this->redirect('admin/secure');
diff --git a/apps/qubit/modules/user/actions/readOnlyAction.class.php b/apps/qubit/modules/user/actions/readOnlyAction.class.php
index 398a4c7f0a..af809e6deb 100644
--- a/apps/qubit/modules/user/actions/readOnlyAction.class.php
+++ b/apps/qubit/modules/user/actions/readOnlyAction.class.php
@@ -19,7 +19,5 @@
 
 class UserReadOnlyAction extends sfAction
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
diff --git a/composer.json b/composer.json
index 835de761ad..912f1d0976 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     },
     "require": {
         "league/csv": "^9.4",
-        "jasig/phpcas": "^1.3.8",
+        "apereo/phpcas": "^1.3.8",
         "ezyang/htmlpurifier": "^4.13",
         "ruflin/elastica": "5.*",
         "jumbojett/openid-connect-php": "^1.0"
diff --git a/composer.lock b/composer.lock
index 6c893e5845..7f4f52f67a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,79 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9ba934b7c4bd12ce351fe9badbe5120b",
+    "content-hash": "035f0da316e6b2ff0e564d5a70f3567a",
     "packages": [
+        {
+            "name": "apereo/phpcas",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/apereo/phpCAS.git",
+                "reference": "c129708154852656aabb13d8606cd5b12dbbabac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/c129708154852656aabb13d8606cd5b12dbbabac",
+                "reference": "c129708154852656aabb13d8606cd5b12dbbabac",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "php": ">=7.1.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0"
+            },
+            "require-dev": {
+                "monolog/monolog": "^1.0.0 || ^2.0.0",
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": ">=7.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "source/CAS.php"
+                ],
+                "classmap": [
+                    "source/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Joachim Fritschi",
+                    "email": "jfritschi@freenet.de",
+                    "homepage": "https://github.com/jfritschi"
+                },
+                {
+                    "name": "Adam Franco",
+                    "homepage": "https://github.com/adamfranco"
+                },
+                {
+                    "name": "Henry Pan",
+                    "homepage": "https://github.com/phy25"
+                }
+            ],
+            "description": "Provides a simple API for authenticating users against a CAS server",
+            "homepage": "https://wiki.jasig.org/display/CASC/phpCAS",
+            "keywords": [
+                "apereo",
+                "cas",
+                "jasig"
+            ],
+            "support": {
+                "issues": "https://github.com/apereo/phpCAS/issues",
+                "source": "https://github.com/apereo/phpCAS/tree/1.6.1"
+            },
+            "time": "2023-02-19T19:52:35+00:00"
+        },
         {
             "name": "elasticsearch/elasticsearch",
             "version": "v5.4.0",
@@ -67,29 +138,39 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.14.0",
+            "version": "v4.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75"
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75",
-                "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
+            },
+            "require-dev": {
+                "cerdic/css-tidy": "^1.7 || ^2.0",
+                "simpletest/simpletest": "dev-master"
+            },
+            "suggest": {
+                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                "ext-tidy": "Used for pretty-printing HTML"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "HTMLPurifier": "library/"
-                },
                 "files": [
                     "library/HTMLPurifier.composer.php"
                 ],
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
                 "exclude-from-classmap": [
                     "/library/HTMLPurifier/Language/"
                 ]
@@ -112,9 +193,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
             },
-            "time": "2021-12-25T01:21:49+00:00"
+            "time": "2023-11-17T15:01:25+00:00"
         },
         {
             "name": "guzzlehttp/ringphp",
@@ -227,95 +308,30 @@
             "abandoned": true,
             "time": "2014-10-12T19:18:40+00:00"
         },
-        {
-            "name": "jasig/phpcas",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/apereo/phpCAS.git",
-                "reference": "ea27d122c4c7114006b33d15668c90f1904d53df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/apereo/phpCAS/zipball/ea27d122c4c7114006b33d15668c90f1904d53df",
-                "reference": "ea27d122c4c7114006b33d15668c90f1904d53df",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "php": ">=7.0.0",
-                "psr/log": "^1.0.0"
-            },
-            "require-dev": {
-                "monolog/monolog": "^1.0.0",
-                "phpunit/phpunit": ">=4.8.35 <8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "source/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Joachim Fritschi",
-                    "email": "jfritschi@freenet.de",
-                    "homepage": "https://github.com/jfritschi"
-                },
-                {
-                    "name": "Adam Franco",
-                    "homepage": "https://github.com/adamfranco"
-                },
-                {
-                    "name": "Henry Pan",
-                    "homepage": "https://github.com/phy25"
-                }
-            ],
-            "description": "Provides a simple API for authenticating users against a CAS server",
-            "homepage": "https://wiki.jasig.org/display/CASC/phpCAS",
-            "keywords": [
-                "apereo",
-                "cas",
-                "jasig"
-            ],
-            "support": {
-                "issues": "https://github.com/apereo/phpCAS/issues",
-                "source": "https://github.com/apereo/phpCAS/tree/1.4.0"
-            },
-            "time": "2021-05-30T19:53:34+00:00"
-        },
         {
             "name": "jumbojett/openid-connect-php",
-            "version": "v1.0.0",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jumbojett/OpenID-Connect-PHP.git",
-                "reference": "4af1d11497ec765dccddf928c14c04535ca96017"
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/4af1d11497ec765dccddf928c14c04535ca96017",
-                "reference": "4af1d11497ec765dccddf928c14c04535ca96017",
+                "url": "https://api.github.com/repos/jumbojett/OpenID-Connect-PHP/zipball/f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
+                "reference": "f327e7eb0626d55ddb6abc7b7c9e6ad3af4e5d51",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
                 "php": ">=7.0",
-                "phpseclib/phpseclib": "~3.0"
+                "phpseclib/phpseclib": "^3.0.7"
             },
             "require-dev": {
+                "phpunit/phpunit": "<10",
                 "roave/security-advisories": "dev-latest",
-                "yoast/phpunit-polyfills": "^1.0"
+                "yoast/phpunit-polyfills": "^2.0"
             },
             "type": "library",
             "autoload": {
@@ -330,9 +346,9 @@
             "description": "Bare-bones OpenID Connect client",
             "support": {
                 "issues": "https://github.com/jumbojett/OpenID-Connect-PHP/issues",
-                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v1.0.0"
+                "source": "https://github.com/jumbojett/OpenID-Connect-PHP/tree/v1.0.2"
             },
-            "time": "2023-12-13T09:52:12+00:00"
+            "time": "2024-09-13T07:08:11+00:00"
         },
         {
             "name": "league/csv",
@@ -420,16 +436,16 @@
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
                 "shasum": ""
             },
             "require": {
@@ -483,7 +499,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2024-05-08T12:18:48+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -537,20 +553,20 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.37",
+            "version": "3.0.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1|^2",
+                "paragonie/constant_time_encoding": "^1|^2|^3",
                 "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
                 "php": ">=5.6.1"
             },
@@ -627,7 +643,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
             },
             "funding": [
                 {
@@ -643,7 +659,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-03T02:14:58+00:00"
+            "time": "2024-09-16T03:06:04+00:00"
         },
         {
             "name": "psr/log",
@@ -697,23 +713,23 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.9.0",
+            "version": "v2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910"
+                "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910",
-                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/1a8460931ea36dc5c76838fec5734d55c88c6831",
+                "reference": "1a8460931ea36dc5c76838fec5734d55c88c6831",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
             "type": "library",
             "autoload": {
@@ -757,19 +773,15 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v2.9.0"
+                "source": "https://github.com/reactphp/promise/tree/v2.11.0"
             },
             "funding": [
                 {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-02-11T10:27:51+00:00"
+            "time": "2023-11-16T16:16:50+00:00"
         },
         {
             "name": "ruflin/elastica",
@@ -835,32 +847,104 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\React\\NDJson\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
+            "keywords": [
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-23T10:58:28+00:00"
+        },
         {
             "name": "composer/pcre",
-            "version": "1.0.1",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+                "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan": "^1.11.10",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpunit/phpunit": "^8 || ^9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
                 }
             },
             "autoload": {
@@ -888,7 +972,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
+                "source": "https://github.com/composer/pcre/tree/3.3.1"
             },
             "funding": [
                 {
@@ -904,28 +988,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T20:24:37+00:00"
+            "time": "2024-08-27T18:44:43+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.2.9",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
-                "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+                "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+                "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
             },
             "type": "library",
             "extra": {
@@ -967,9 +1051,9 @@
                 "versioning"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.9"
+                "source": "https://github.com/composer/semver/tree/3.4.3"
             },
             "funding": [
                 {
@@ -985,31 +1069,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-04T13:58:43+00:00"
+            "time": "2024-09-19T14:15:21+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "3.0.1",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/12f1b79476638a5615ed00ea6adbb269cec96fd8",
-                "reference": "12f1b79476638a5615ed00ea6adbb269cec96fd8",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
+                "composer/pcre": "^1 || ^2 || ^3",
                 "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
             },
             "type": "library",
             "autoload": {
@@ -1033,9 +1117,9 @@
                 "performance"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.1"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
             },
             "funding": [
                 {
@@ -1051,105 +1135,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T18:29:42+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "1.13.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "ext-tokenizer": "*",
-                "php": "^7.1 || ^8.0",
-                "psr/cache": "^1 || ^2 || ^3"
-            },
-            "require-dev": {
-                "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^0.12.20",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "https://www.doctrine-project.org/projects/annotations.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.2"
-            },
-            "time": "2021-08-05T19:00:23+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9 || ^11",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.30 || ^5.4"
             },
             "type": "library",
             "autoload": {
@@ -1176,7 +1189,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
             },
             "funding": [
                 {
@@ -1192,35 +1205,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
         },
         {
-            "name": "doctrine/lexer",
-            "version": "1.2.2",
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c"
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
-                "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
-                "phpstan/phpstan": "1.3",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "phpunit/phpunit": "^9 || ^6"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Evenement\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1229,113 +1239,156 @@
             ],
             "authors": [
                 {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
                 }
             ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "description": "Événement is a very simple event dispatching library for PHP",
             "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
+                "event-dispatcher",
+                "event-emitter"
             ],
             "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.2"
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
             },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-01-12T08:27:12+00:00"
+            "time": "2023-08-08T05:53:35+00:00"
         },
         {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.6.0",
+            "name": "fidry/cpu-core-counter",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa"
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1975e4453eb2726d1f50da0ce7fa91295029a4fa",
-                "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+                "reference": "8520451a140d3f46ac33042715115e290cf5785f",
                 "shasum": ""
             },
             "require": {
-                "composer/semver": "^3.2",
-                "composer/xdebug-handler": "^3.0",
-                "doctrine/annotations": "^1.13",
-                "ext-json": "*",
-                "ext-tokenizer": "*",
-                "php": "^7.4 || ^8.0",
-                "php-cs-fixer/diff": "^2.0",
-                "symfony/console": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/filesystem": "^5.4 || ^6.0",
-                "symfony/finder": "^5.4 || ^6.0",
-                "symfony/options-resolver": "^5.4 || ^6.0",
-                "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php80": "^1.23",
-                "symfony/polyfill-php81": "^1.23",
-                "symfony/process": "^5.4 || ^6.0",
-                "symfony/stopwatch": "^5.4 || ^6.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "justinrainbow/json-schema": "^5.2",
-                "keradus/cli-executor": "^1.5",
-                "mikey179/vfsstream": "^1.6.10",
-                "php-coveralls/php-coveralls": "^2.5.2",
-                "php-cs-fixer/accessible-object": "^1.1",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "phpunitgoodpractices/polyfill": "^1.5",
-                "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^6.0",
-                "symfony/yaml": "^5.4 || ^6.0"
-            },
-            "suggest": {
-                "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters."
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^1.9.2",
+                "phpstan/phpstan-deprecation-rules": "^1.0.0",
+                "phpstan/phpstan-phpunit": "^1.2.2",
+                "phpstan/phpstan-strict-rules": "^1.4.4",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
             },
-            "bin": [
-                "php-cs-fixer"
-            ],
-            "type": "application",
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "PhpCsFixer\\": "src/"
+                    "Fidry\\CpuCoreCounter\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Tiny utility to get the number of CPU cores.",
+            "keywords": [
+                "CPU",
+                "core"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-08-06T10:04:20+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.64.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "58dd9c931c785a79739310aef5178928305ffa67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67",
+                "reference": "58dd9c931c785a79739310aef5178928305ffa67",
+                "shasum": ""
+            },
+            "require": {
+                "clue/ndjson-react": "^1.0",
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.3",
+                "ext-filter": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.0",
+                "php": "^7.4 || ^8.0",
+                "react/child-process": "^0.6.5",
+                "react/event-loop": "^1.0",
+                "react/promise": "^2.0 || ^3.0",
+                "react/socket": "^1.0",
+                "react/stream": "^1.0",
+                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.28",
+                "symfony/polyfill-php80": "^1.28",
+                "symfony/polyfill-php81": "^1.28",
+                "symfony/process": "^5.4 || ^6.0 || ^7.0",
+                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "facile-it/paraunit": "^1.3 || ^2.3",
+                "infection/infection": "^0.29.5",
+                "justinrainbow/json-schema": "^5.2",
+                "keradus/cli-executor": "^2.1",
+                "mikey179/vfsstream": "^1.6.11",
+                "php-coveralls/php-coveralls": "^2.7",
+                "php-cs-fixer/accessible-object": "^1.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
+                "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
+                "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "exclude-from-classmap": [
+                    "src/Fixer/Internal/*"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
             "authors": [
                 {
                     "name": "Fabien Potencier",
@@ -1347,9 +1400,15 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
             "support": {
-                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.6.0"
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0"
             },
             "funding": [
                 {
@@ -1357,27 +1416,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-07T18:02:40+00:00"
+            "time": "2024-08-30T23:09:38+00:00"
         },
         {
             "name": "mikey179/vfsstream",
-            "version": "v1.6.10",
+            "version": "v1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "250c0825537d501e327df879fb3d4cd751933b85"
+                "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/250c0825537d501e327df879fb3d4cd751933b85",
-                "reference": "250c0825537d501e327df879fb3d4cd751933b85",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fe695ec993e0a55c3abdda10a9364eb31c6f1bf0",
+                "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.5|^5.0"
+                "phpunit/phpunit": "^7.5||^8.5||^9.6",
+                "yoast/phpunit-polyfills": "^2.0"
             },
             "type": "library",
             "extra": {
@@ -1408,32 +1468,34 @@
                 "source": "https://github.com/bovigo/vfsStream/tree/master",
                 "wiki": "https://github.com/bovigo/vfsStream/wiki"
             },
-            "time": "2021-09-25T08:05:01+00:00"
+            "time": "2024-08-29T18:43:31+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
@@ -1458,7 +1520,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -1466,29 +1528,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.2",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
-                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1496,7 +1560,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1520,26 +1584,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2021-11-30T19:35:32+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -1580,9 +1645,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -1637,16 +1708,16 @@
         },
         {
             "name": "phing/phing",
-            "version": "2.17.2",
+            "version": "2.17.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phingofficial/phing.git",
-                "reference": "8b8cee3eb12c24502fc4c227ac5889746248a140"
+                "reference": "9f3bc8c72e65452686dcf64497e02a082f138908"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/8b8cee3eb12c24502fc4c227ac5889746248a140",
-                "reference": "8b8cee3eb12c24502fc4c227ac5889746248a140",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/9f3bc8c72e65452686dcf64497e02a082f138908",
+                "reference": "9f3bc8c72e65452686dcf64497e02a082f138908",
                 "shasum": ""
             },
             "require": {
@@ -1729,7 +1800,7 @@
             "support": {
                 "irc": "irc://irc.freenode.net/phing",
                 "issues": "https://www.phing.info/trac/report",
-                "source": "https://github.com/phingofficial/phing/tree/2.17.2"
+                "source": "https://github.com/phingofficial/phing/tree/2.17.4"
             },
             "funding": [
                 {
@@ -1745,327 +1816,48 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-02-09T09:50:58+00:00"
-        },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "sebastian/diff v3 backport support for PHP 5.6+",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
-            },
-            "time": "2020-10-14T08:32:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
-            },
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
-            },
-            "time": "2022-01-04T19:58:01+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
-            },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2022-07-08T09:07:07+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.12",
+            "version": "9.2.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631"
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631",
-                "reference": "c011a0b6aaa4acd2f39b7f51fb4ad4442b6ec631",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6"
             },
             "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "9.2.x-dev"
                 }
             },
             "autoload": {
@@ -2093,7 +1885,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.12"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
             },
             "funding": [
                 {
@@ -2101,7 +1894,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T06:30:26+00:00"
+            "time": "2024-08-22T04:23:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2346,55 +2139,50 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.15",
+            "version": "9.6.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "dc738383c519243b0a967f63943a848d3fd861aa"
+                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/dc738383c519243b0a967f63943a848d3fd861aa",
-                "reference": "dc738383c519243b0a967f63943a848d3fd861aa",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
+                "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.5.0 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.12",
-                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
                 "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
+                "sebastian/comparator": "^4.0.8",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.6",
+                "sebastian/global-state": "^5.0.7",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "bin": [
                 "phpunit"
@@ -2402,77 +2190,408 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.5-dev"
+                    "dev-master": "9.6-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "src/Framework/Assert/Functions.php"
-                ],
-                "classmap": [
-                    "src/"
-                ]
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-19T10:50:18+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
+            },
+            "time": "2021-11-05T16:50:12+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2022-11-30T15:59:55+00:00"
+        },
+        {
+            "name": "react/child-process",
+            "version": "v0.6.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+                "react/socket": "^1.8",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\ChildProcess\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven library for executing child processes with ReactPHP.",
+            "keywords": [
+                "event-driven",
+                "process",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-09-16T13:41:56+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
+            "description": "Async DNS resolver for ReactPHP",
             "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
             ],
             "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.15"
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/sponsors.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                 }
             ],
-            "time": "2022-02-23T08:53:20+00:00"
+            "time": "2024-06-13T14:18:03+00:00"
         },
         {
-            "name": "psr/cache",
-            "version": "1.0.1",
+            "name": "react/event-loop",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\Cache\\": "src/"
+                    "React\\EventLoop\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2481,42 +2600,75 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Common interface for caching libraries",
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
             "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
+                "asynchronous",
+                "event-loop"
             ],
             "support": {
-                "source": "https://github.com/php-fig/cache/tree/master"
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
             },
-            "time": "2016-08-06T20:24:11+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-11-13T13:48:05+00:00"
         },
         {
-            "name": "psr/container",
-            "version": "1.1.2",
+            "name": "react/socket",
+            "version": "v1.16.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4.0"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.13",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3.3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.11"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\Container\\": "src/"
+                    "React\\Socket\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2525,51 +2677,73 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
             "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-07-26T10:38:09+00:00"
         },
         {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
+            "name": "react/stream",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
             },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
             },
+            "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
+                    "React\\Stream\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2578,34 +2752,61 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
-            "description": "Standard interfaces for event handling.",
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
             "keywords": [
-                "events",
-                "psr",
-                "psr-14"
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
             },
-            "time": "2019-01-08T18:20:26+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -2640,7 +2841,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -2648,7 +2849,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -2763,16 +2964,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
@@ -2825,7 +3026,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -2833,24 +3034,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -2882,7 +3083,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -2890,20 +3091,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -2948,7 +3149,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -2956,20 +3157,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                 "shasum": ""
             },
             "require": {
@@ -3011,7 +3212,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
             },
             "funding": [
                 {
@@ -3019,20 +3220,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
@@ -3088,7 +3289,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -3096,20 +3297,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
@@ -3152,7 +3353,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -3160,24 +3361,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -3209,7 +3410,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -3217,7 +3418,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -3333,16 +3534,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                 "shasum": ""
             },
             "require": {
@@ -3381,10 +3582,10 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
             },
             "funding": [
                 {
@@ -3392,20 +3593,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -3417,7 +3618,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -3438,8 +3639,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -3447,32 +3647,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -3495,7 +3695,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
             },
             "funding": [
                 {
@@ -3503,7 +3703,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3560,16 +3760,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.3",
+            "version": "v5.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8"
+                "reference": "5b5a0aa66e3296e303e22490f90f521551835a83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
-                "reference": "a2a86ec353d825c75856c6fd14fac416a7bdb6b8",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5b5a0aa66e3296e303e22490f90f521551835a83",
+                "reference": "5b5a0aa66e3296e303e22490f90f521551835a83",
                 "shasum": ""
             },
             "require": {
@@ -3634,12 +3834,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.3"
+                "source": "https://github.com/symfony/console/tree/v5.4.44"
             },
             "funding": [
                 {
@@ -3655,20 +3855,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-26T16:28:35+00:00"
+            "time": "2024-09-20T07:56:40+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "80d075412b557d41002320b96a096ca65aa2c98d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d",
+                "reference": "80d075412b557d41002320b96a096ca65aa2c98d",
                 "shasum": ""
             },
             "require": {
@@ -3706,7 +3906,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -3722,20 +3922,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2023-01-24T14:02:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.3",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d"
+                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d",
-                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4",
+                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4",
                 "shasum": ""
             },
             "require": {
@@ -3791,7 +3991,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.3"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -3807,20 +4007,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/540f4c73e87fd0c71ca44a6aa305d024ac68cb73",
+                "reference": "540f4c73e87fd0c71ca44a6aa305d024ac68cb73",
                 "shasum": ""
             },
             "require": {
@@ -3870,7 +4070,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -3886,20 +4086,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2024-01-23T13:51:25+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.3",
+            "version": "v5.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b"
+                "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b",
-                "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/76c3818964e9d32be3862c9318ae3ba9aa280ddc",
+                "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc",
                 "shasum": ""
             },
             "require": {
@@ -3908,6 +4108,9 @@
                 "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
+            "require-dev": {
+                "symfony/process": "^5.4|^6.4"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3934,7 +4137,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.3"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.44"
             },
             "funding": [
                 {
@@ -3950,20 +4153,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-09-16T14:52:48+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.3",
+            "version": "v5.4.43",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
+                "reference": "ae25a9145a900764158d439653d5630191155ca0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
-                "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0",
+                "reference": "ae25a9145a900764158d439653d5630191155ca0",
                 "shasum": ""
             },
             "require": {
@@ -3997,7 +4200,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.3"
+                "source": "https://github.com/symfony/finder/tree/v5.4.43"
             },
             "funding": [
                 {
@@ -4013,20 +4216,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-26T16:34:36+00:00"
+            "time": "2024-08-13T14:03:51+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.3",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
+                "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/bd1afbde6613a8d6b956115e0e14b196191fd0c4",
+                "reference": "bd1afbde6613a8d6b956115e0e14b196191fd0c4",
                 "shasum": ""
             },
             "require": {
@@ -4066,7 +4269,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.3"
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -4082,24 +4285,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -4109,21 +4312,18 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4148,7 +4348,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4164,33 +4364,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-20T20:35:02+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
-                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4229,7 +4426,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4245,33 +4442,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T21:10:46+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4313,7 +4507,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4329,24 +4523,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -4356,9 +4550,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4396,7 +4587,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4412,30 +4603,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
-                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4475,7 +4663,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4491,30 +4679,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-05T21:20:04+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
-                "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4558,7 +4743,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4574,30 +4759,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:33+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
-                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.23-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -4637,7 +4819,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -4653,20 +4835,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-13T13:58:11+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.3",
+            "version": "v5.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "553f50487389a977eb31cf6b37faae56da00f753"
+                "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753",
-                "reference": "553f50487389a977eb31cf6b37faae56da00f753",
+                "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
+                "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096",
                 "shasum": ""
             },
             "require": {
@@ -4699,7 +4881,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.3"
+                "source": "https://github.com/symfony/process/tree/v5.4.44"
             },
             "funding": [
                 {
@@ -4715,26 +4897,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-26T16:28:35+00:00"
+            "time": "2024-09-17T12:46:43+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3",
+                "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -4782,7 +4964,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -4798,20 +4980,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2023-04-21T15:04:16+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.4.3",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "395220730edceb6bd745236ccb5c9125c748f779"
+                "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779",
-                "reference": "395220730edceb6bd745236ccb5c9125c748f779",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0e9daf3b7c805c747638b2cc48f1649e594f9625",
+                "reference": "0e9daf3b7c805c747638b2cc48f1649e594f9625",
                 "shasum": ""
             },
             "require": {
@@ -4844,7 +5026,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.3"
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -4860,20 +5042,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.3",
+            "version": "v5.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
+                "reference": "832caa16b6d9aac6bf11747315225f5aba384c24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
-                "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
+                "url": "https://api.github.com/repos/symfony/string/zipball/832caa16b6d9aac6bf11747315225f5aba384c24",
+                "reference": "832caa16b6d9aac6bf11747315225f5aba384c24",
                 "shasum": ""
             },
             "require": {
@@ -4895,12 +5077,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -4930,7 +5112,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.3"
+                "source": "https://github.com/symfony/string/tree/v5.4.44"
             },
             "funding": [
                 {
@@ -4946,20 +5128,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-09-20T07:56:40+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -4988,7 +5170,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -4996,65 +5178,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "time": "2021-03-09T10:59:23+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
diff --git a/lib/CsvImportAuditer.class.php b/lib/CsvImportAuditer.class.php
index f35ead5630..ff7afdbf67 100644
--- a/lib/CsvImportAuditer.class.php
+++ b/lib/CsvImportAuditer.class.php
@@ -116,7 +116,7 @@ public function validateFilename($filename): string
         return $filename;
     }
 
-    public function setOptions(array $options = null): void
+    public function setOptions(?array $options = null): void
     {
         if (empty($options)) {
             return;
diff --git a/lib/CsvImportValidator.class.php b/lib/CsvImportValidator.class.php
index 798748d000..f506ef93cd 100644
--- a/lib/CsvImportValidator.class.php
+++ b/lib/CsvImportValidator.class.php
@@ -69,7 +69,7 @@ class CsvImportValidator
     ];
 
     public function __construct(
-        sfContext $context = null,
+        ?sfContext $context = null,
         $dbcon = null,
         $options = []
     ) {
@@ -213,7 +213,7 @@ public function getValidatorCollection(): ?CsvValidatorCollection
         return $this->validatorCollection;
     }
 
-    public function setOptions(array $options = null)
+    public function setOptions(?array $options = null)
     {
         if (empty($options)) {
             return;
diff --git a/lib/PhysicalobjectCsvImporter.class.php b/lib/PhysicalobjectCsvImporter.class.php
index a282121ccc..8df69e4b39 100644
--- a/lib/PhysicalobjectCsvImporter.class.php
+++ b/lib/PhysicalobjectCsvImporter.class.php
@@ -71,7 +71,7 @@ class PhysicalObjectCsvImporter
     //
 
     public function __construct(
-        sfContext $context = null,
+        ?sfContext $context = null,
         $dbcon = null,
         $options = []
     ) {
@@ -165,7 +165,7 @@ public function validateFilename($filename)
         return $filename;
     }
 
-    public function setOptions(array $options = null)
+    public function setOptions(?array $options = null)
     {
         if (empty($options)) {
             return;
@@ -198,6 +198,7 @@ public function setOption(string $name, $value)
                 $this->setProgressFrequency($value);
 
                 break;
+
             // boolean options
             case 'debug':
             case 'insertNew':
@@ -247,7 +248,7 @@ public function getOffset()
         return $this->offset;
     }
 
-    public function setHeader(string $str = null)
+    public function setHeader(?string $str = null)
     {
         if (null === $str) {
             $this->options['header'] = null;
@@ -769,7 +770,7 @@ protected function processColumn($key, $val, $culture)
         }
     }
 
-    protected function processDescriptionSlugs(string $str = null)
+    protected function processDescriptionSlugs(?string $str = null)
     {
         $ids = [];
 
@@ -842,8 +843,7 @@ protected function getTypeIdLookupTable()
         if (null === $this->typeIdLookupTable) {
             $this->typeIdLookupTable = $this
                 ->getPhysicalObjectTypeTaxonomy()
-                ->getTermNameToIdLookupTable($this->getDbConnection())
-            ;
+                ->getTermNameToIdLookupTable($this->getDbConnection());
 
             if (null === $this->typeIdLookupTable) {
                 throw new sfException(
diff --git a/lib/QubitFindingAidGenerator.class.php b/lib/QubitFindingAidGenerator.class.php
index 5941ee186d..7e45e03360 100644
--- a/lib/QubitFindingAidGenerator.class.php
+++ b/lib/QubitFindingAidGenerator.class.php
@@ -435,7 +435,7 @@ public function generateEadFile(): string
      * Apache FOP requires certain namespaces to be included in the XML in order
      * to process it.
      */
-    public function addEadNamespaces(string $filename, string $url = null): void
+    public function addEadNamespaces(string $filename, ?string $url = null): void
     {
         $content = file_get_contents($filename);
 
diff --git a/lib/QubitFlatfileImport.class.php b/lib/QubitFlatfileImport.class.php
index 13388828f2..2f90767598 100644
--- a/lib/QubitFlatfileImport.class.php
+++ b/lib/QubitFlatfileImport.class.php
@@ -1585,7 +1585,7 @@ protected function rowProcessingBeforeObjectCreation($row)
             ) {
                 $self->rowStatusVars[$self->columnNames[$index]] = $value;
             } elseif (
-                isset($self->columnNames[$index], $self->arrayColumns[($self->columnNames[$index])])
+                isset($self->columnNames[$index], $self->arrayColumns[$self->columnNames[$index]])
             ) {
                 $self->arrayColumnHandler($columnName, $self->arrayColumns[$columnName], $value);
             }
@@ -1622,7 +1622,7 @@ protected function rowProcessingBeforeSave($row)
                     );
                 }
             } elseif (
-                isset($self->columnNames[$index], $self->handlers[($self->columnNames[$index])])
+                isset($self->columnNames[$index], $self->handlers[$self->columnNames[$index]])
             ) {
                 // otherwise, if column is data and a handler for it is set, use it
                 call_user_func_array(
@@ -2149,7 +2149,7 @@ private function getExistingNotes($objectId, $typeId, $culture)
             AND n.type_id=?
             AND i.culture=?';
 
-        $statement = self::sqlQuery($query, [$objectId, $typeId,  $culture]);
+        $statement = self::sqlQuery($query, [$objectId, $typeId, $culture]);
 
         foreach ($statement->fetchAll(PDO::FETCH_OBJ) as $row) {
             $existingNotes[] = $row->content;
diff --git a/lib/QubitLftSyncer.class.php b/lib/QubitLftSyncer.class.php
index 22581c6fd3..4b1dc5ab44 100644
--- a/lib/QubitLftSyncer.class.php
+++ b/lib/QubitLftSyncer.class.php
@@ -69,8 +69,7 @@ private function getChildLftChecksumForElasticsearch()
         $result = QubitSearch::getInstance()
             ->index
             ->getType('QubitInformationObject')
-            ->search($query->getQuery(false, false))
-        ;
+            ->search($query->getQuery(false, false));
 
         // Amalgamate lft values in array
         $lft = [];
diff --git a/lib/QubitMetsParser.class.php b/lib/QubitMetsParser.class.php
index 7bbfb19ae3..133ac1df51 100644
--- a/lib/QubitMetsParser.class.php
+++ b/lib/QubitMetsParser.class.php
@@ -567,9 +567,9 @@ public function getPreservationCopyCreationTime($fileId)
     protected function getOriginalFile($fileId)
     {
         if (
-            (false !== $file = $this->document->xpath(
+            false !== $file = $this->document->xpath(
                 sprintf('//m:fileSec/m:fileGrp[@USE="original"]/m:file[@ID="%s"]', $fileId)
-            ))
+            )
         ) {
             return $file[0];
         }
@@ -605,9 +605,9 @@ protected function getPreservationFile($fileId)
     protected function getOriginalFileNameFromAmdSec($admId)
     {
         if (
-            (false !== $originalName = $this->document->xpath(
+            false !== $originalName = $this->document->xpath(
                 sprintf('//m:amdSec[@ID="%s"]/m:techMD/m:mdWrap/m:xmlData/p:object/p:originalName', $admId)
-            ))
+            )
         ) {
             $parts = explode('/', (string) $originalName[0]);
 
@@ -625,9 +625,9 @@ protected function getOriginalFileNameFromAmdSec($admId)
     protected function getSizeFromAmdSec($admId)
     {
         if (
-            (false !== $size = $this->document->xpath(
+            false !== $size = $this->document->xpath(
                 sprintf('//m:amdSec[@ID="%s"]/m:techMD/m:mdWrap/m:xmlData/p:object/p:objectCharacteristics/p:size', $admId)
-            ))
+            )
         ) {
             return $size[0];
         }
diff --git a/lib/QubitPhysicalObjectCsvHoldingsReport.class.php b/lib/QubitPhysicalObjectCsvHoldingsReport.class.php
index 6f5b8963e7..5ffc17744b 100644
--- a/lib/QubitPhysicalObjectCsvHoldingsReport.class.php
+++ b/lib/QubitPhysicalObjectCsvHoldingsReport.class.php
@@ -68,7 +68,7 @@ public function __construct(array $options = [])
         ]);
     }
 
-    public function setOptions(array $options = null)
+    public function setOptions(?array $options = null)
     {
         if (empty($options)) {
             return;
diff --git a/lib/QubitQuery.class.php b/lib/QubitQuery.class.php
index 2193325f31..5952715513 100644
--- a/lib/QubitQuery.class.php
+++ b/lib/QubitQuery.class.php
@@ -114,9 +114,7 @@ public function offsetSet($offset, $value)
         return call_user_func_array([$this, '__set'], $args);
     }
 
-    public function offsetUnset($offset)
-    {
-    }
+    public function offsetUnset($offset) {}
 
     public function count()
     {
diff --git a/lib/QubitTestFunctional.class.php b/lib/QubitTestFunctional.class.php
index 819e584a46..fd93262472 100644
--- a/lib/QubitTestFunctional.class.php
+++ b/lib/QubitTestFunctional.class.php
@@ -21,7 +21,7 @@
 
 class StubAcl extends Zend_Acl
 {
-    public function allow($roles = null, $resource = null, $privileges = null, Zend_Acl_Assert_Interface $assert = null)
+    public function allow($roles = null, $resource = null, $privileges = null, ?Zend_Acl_Assert_Interface $assert = null)
     {
         return $this;
     }
diff --git a/lib/QubitXmlImport.class.php b/lib/QubitXmlImport.class.php
index 099ee6adee..6a717571ab 100644
--- a/lib/QubitXmlImport.class.php
+++ b/lib/QubitXmlImport.class.php
@@ -138,14 +138,14 @@ public function import($xmlFile, $options = [], $xmlOrigFileName = null)
             'http://www.loc.gov/mods/' => 'mods',
             'http://www.loc.gov/MARC21/slim' => 'marc',
             // root element names
-            //'collection' => 'marc',
-            //'record' => 'marc',
+            // 'collection' => 'marc',
+            // 'record' => 'marc',
             'record' => 'oai_dc_record',
             'dc' => 'dc',
             'oai_dc:dc' => 'dc',
             'dublinCore' => 'dc',
             'metadata' => 'dc',
-            //'mets' => 'mets',
+            // 'mets' => 'mets',
             'mods' => 'mods',
             'ead' => 'ead',
             'add' => 'alouette',
@@ -262,6 +262,7 @@ public function import($xmlFile, $options = [], $xmlOrigFileName = null)
             if (is_object($urlValues = $importDOM->xpath->query('//eadheader/eadid/@url'))) {
                 foreach ($urlValues as $url) {
                     $this->eadUrl = trim(preg_replace('/[\n\r\s]+/', ' ', $url->nodeValue));
+
                     // Possibly more than one url but we can only take one. Take first
                     // valid one.
                     break;
@@ -296,6 +297,7 @@ public function import($xmlFile, $options = [], $xmlOrigFileName = null)
                         $this->errors[] = $this->i18n->__('EAD "langmaterial" is set to').': "'.$isocode.'" ('.format_language($twoCharCode, 'en').'). '.$this->i18n->__('Your XML document has been saved in this language and your user interface has just been switched to this language.');
                     }
                     $sf_user->setCulture($twoCharCode);
+
                     // can only set to one language, so have to break once the first valid language is encountered
                     break;
                 }
@@ -475,7 +477,7 @@ public static function normalizeNodeValue($node, $methodMap = [])
     {
         $nodeValue = '';
 
-        if (!($node instanceof DOMAttr)) {
+        if (!$node instanceof DOMAttr) {
             $nodeList = $node->getElementsByTagName('p');
 
             if (0 < $nodeList->length) {
@@ -1115,9 +1117,9 @@ private function handlePreSaveLogic($resource)
      *
      * @param QubitInformationObject $io The information object to check
      *
-     * @throws sfException When the limit option is not accepted
-     *
      * @return bool The information object passes the limit option or not
+     *
+     * @throws sfException When the limit option is not accepted
      */
     private function passesLimitOptionForIo($io)
     {
@@ -1148,9 +1150,9 @@ private function passesLimitOptionForIo($io)
      *
      * @param QubitActor $actor The actor object to check
      *
-     * @throws sfException When the limit option is not accepted
-     *
      * @return bool The actor passes the limit option or not
+     *
+     * @throws sfException When the limit option is not accepted
      */
     private function passesLimitOptionForActor($actor)
     {
diff --git a/lib/arInstall.class.php b/lib/arInstall.class.php
index 16bed2c804..c8ead219a8 100644
--- a/lib/arInstall.class.php
+++ b/lib/arInstall.class.php
@@ -334,8 +334,7 @@ public static function loadData($dispatcher, $formatter)
 
         $premisAccessRightValues = [];
         foreach (
-            QubitTaxonomy::getTermsById(QubitTaxonomy::RIGHT_BASIS_ID)
-            as $item
+            QubitTaxonomy::getTermsById(QubitTaxonomy::RIGHT_BASIS_ID) as $item
         ) {
             $premisAccessRightValues[$item->slug] = [
                 'allow_master' => 1,
@@ -367,8 +366,7 @@ public static function loadData($dispatcher, $formatter)
         );
 
         foreach (
-            QubitTaxonomy::getTermsById(QubitTaxonomy::RIGHT_BASIS_ID)
-            as $item
+            QubitTaxonomy::getTermsById(QubitTaxonomy::RIGHT_BASIS_ID) as $item
         ) {
             $setting = new QubitSetting();
             $setting->name = "{$item->slug}_disallow";
@@ -376,8 +374,7 @@ public static function loadData($dispatcher, $formatter)
             $setting->setValue($accessDisallowWarning, ['culture' => 'en']);
 
             foreach (
-                QubitI18N::getTranslations($accessDisallowWarning)
-                as $langCode => $message
+                QubitI18N::getTranslations($accessDisallowWarning) as $langCode => $message
             ) {
                 $setting->setValue($message, ['culture' => $langCode]);
             }
@@ -390,8 +387,7 @@ public static function loadData($dispatcher, $formatter)
             $setting->setValue($accessConditionalWarning, ['culture' => 'en']);
 
             foreach (
-                QubitI18N::getTranslations($accessConditionalWarning)
-                as $langCode => $message
+                QubitI18N::getTranslations($accessConditionalWarning) as $langCode => $message
             ) {
                 $setting->setValue($message, ['culture' => $langCode]);
             }
diff --git a/lib/debug/arWebDebugPanel.class.php b/lib/debug/arWebDebugPanel.class.php
index 5df1025661..d1b7084232 100644
--- a/lib/debug/arWebDebugPanel.class.php
+++ b/lib/debug/arWebDebugPanel.class.php
@@ -44,9 +44,7 @@ public function getPanelTitle()
         return 'AtoM';
     }
 
-    public function getPanelContent()
-    {
-    }
+    public function getPanelContent() {}
 
     protected function getCurrentGitRevision()
     {
diff --git a/lib/filter/QubitTransactionFilter.class.php b/lib/filter/QubitTransactionFilter.class.php
index b8a4ea01fe..48fe98f253 100644
--- a/lib/filter/QubitTransactionFilter.class.php
+++ b/lib/filter/QubitTransactionFilter.class.php
@@ -89,8 +89,7 @@ protected function retry()
             ->getController()
             ->getActionStack()
             ->getLastEntry()
-            ->getActionInstance()
-        ;
+            ->getActionInstance();
 
         // Create a new filter chain and reload config
         $filterChain = new sfFilterChain();
diff --git a/lib/flatfile/QubitFlatfileExport.class.php b/lib/flatfile/QubitFlatfileExport.class.php
index 86cf7c4fc1..7dee9318ce 100644
--- a/lib/flatfile/QubitFlatfileExport.class.php
+++ b/lib/flatfile/QubitFlatfileExport.class.php
@@ -355,8 +355,8 @@ public function getHiddenVisibleElementCsvHeaders()
             // Get list of elements hidden from settings
             foreach (sfConfig::getAll() as $setting => $value) {
                 if (
-                    (false !== strpos($setting, ('app_element_visibility_'.$template)))
-                    && (!strpos($setting, ('__source')))
+                    (false !== strpos($setting, 'app_element_visibility_'.$template))
+                    && (!strpos($setting, '__source'))
                     && (0 == sfConfig::get($setting))
                 ) {
                     array_push($nonVisibleElements, $setting);
@@ -391,9 +391,7 @@ public function getHiddenVisibleElementCsvHeaders()
      *
      * @return void
      */
-    protected function config(&$config)
-    {
-    }
+    protected function config(&$config) {}
 
     /*
      *
diff --git a/lib/helper/QubitHelper.php b/lib/helper/QubitHelper.php
index db0d1817dd..8d1c26e640 100644
--- a/lib/helper/QubitHelper.php
+++ b/lib/helper/QubitHelper.php
@@ -443,7 +443,7 @@ function hr_filesize($val)
         }
     }
 
-    return round(($val / pow(1024, $i)), 1).' '.$units[$i];
+    return round($val / pow(1024, $i), 1).' '.$units[$i];
 }
 
 function render_treeview_node($item, array $classes = [], array $options = [])
@@ -485,7 +485,7 @@ function render_treeview_node($item, array $classes = [], array $options = [])
         }
 
         if (0 < count($dataTitle)) {
-            $node .= ' data-title="'.strip_tags((implode(' - ', $dataTitle))).'"';
+            $node .= ' data-title="'.strip_tags(implode(' - ', $dataTitle)).'"';
         }
     } elseif ($item instanceof QubitTerm) {
         $node .= ' data-title="'.esc_entities(sfConfig::get('app_ui_label_term')).'"';
@@ -580,7 +580,7 @@ function render_b5_treeview_node($item, array $classes = [], array $options = []
         }
 
         if (0 < count($dataTitle)) {
-            $node .= ' data-title="'.strip_tags((implode(' - ', $dataTitle))).'"';
+            $node .= ' data-title="'.strip_tags(implode(' - ', $dataTitle)).'"';
         }
     } elseif ($item instanceof QubitTerm) {
         $node .= ' data-title="'.esc_entities(sfConfig::get('app_ui_label_term')).'"';
diff --git a/lib/job/arActorExportJob.class.php b/lib/job/arActorExportJob.class.php
index 98fde8b4ca..2abafc151a 100644
--- a/lib/job/arActorExportJob.class.php
+++ b/lib/job/arActorExportJob.class.php
@@ -47,8 +47,7 @@ public static function findExportRecords($parameters)
         return QubitSearch::getInstance()
             ->index
             ->getType('QubitActor')
-            ->createSearch($query->getQuery(false, false))
-        ;
+            ->createSearch($query->getQuery(false, false));
     }
 
     /**
diff --git a/lib/job/arInformationObjectExportJob.class.php b/lib/job/arInformationObjectExportJob.class.php
index c9225e01bd..ab2a6d8e70 100644
--- a/lib/job/arInformationObjectExportJob.class.php
+++ b/lib/job/arInformationObjectExportJob.class.php
@@ -65,8 +65,7 @@ public static function findExportRecords($parameters)
         return QubitSearch::getInstance()
             ->index
             ->getType('QubitInformationObject')
-            ->createSearch($query->getQuery(false, false))
-        ;
+            ->createSearch($query->getQuery(false, false));
     }
 
     /**
diff --git a/lib/job/arInformationObjectXmlExportJob.class.php b/lib/job/arInformationObjectXmlExportJob.class.php
index 33704033ad..64504a96c7 100644
--- a/lib/job/arInformationObjectXmlExportJob.class.php
+++ b/lib/job/arInformationObjectXmlExportJob.class.php
@@ -146,8 +146,8 @@ protected function getHiddenVisibleElementXmlHeaders()
         // Get list of elements hidden from settings
         foreach (sfConfig::getAll() as $setting => $value) {
             if (
-                (false !== strpos($setting, ('app_element_visibility_'.$template)))
-                && (!strpos($setting, ('__source')))
+                (false !== strpos($setting, 'app_element_visibility_'.$template))
+                && (!strpos($setting, '__source'))
                 && (0 == sfConfig::get($setting))
             ) {
                 array_push($nonVisibleElements, $setting);
diff --git a/lib/model/QubitActor.php b/lib/model/QubitActor.php
index 43e5e117e5..632d977e41 100644
--- a/lib/model/QubitActor.php
+++ b/lib/model/QubitActor.php
@@ -272,8 +272,8 @@ public static function getRoot()
 
     public static function getAllExceptUsers($options = [])
     {
-        //returns all Actor objects except those that are
-        //also an instance of the User class
+        // returns all Actor objects except those that are
+        // also an instance of the User class
         $criteria = new Criteria();
         $criteria->add(QubitObject::CLASS_NAME, 'QubitActor');
 
@@ -448,7 +448,7 @@ public function setTermRelation($termId, $relationNote = null)
         $newTermRelation = new QubitObjectTermRelation();
         $newTermRelation->setTermId($termId);
 
-        //TODO: move to QubitNote
+        // TODO: move to QubitNote
         //  $newTermRelation->setRelationNote($relationNote);
         $newTermRelation->setObjectId($this->id);
         $newTermRelation->save();
@@ -476,7 +476,7 @@ public function getTermRelations($taxonomyId = 'all')
 
     public function getDatesOfChanges()
     {
-        //TO DO
+        // TO DO
 
         return null;
     }
diff --git a/lib/model/QubitActorI18n.php b/lib/model/QubitActorI18n.php
index 284e1dd4e0..c5e270d876 100644
--- a/lib/model/QubitActorI18n.php
+++ b/lib/model/QubitActorI18n.php
@@ -22,6 +22,4 @@
  *
  * @see lib/model/om/BaseActorI18n.php
  */
-class QubitActorI18n extends BaseActorI18n
-{
-}
+class QubitActorI18n extends BaseActorI18n {}
diff --git a/lib/model/QubitAuditLog.php b/lib/model/QubitAuditLog.php
index 645352cf36..053dfe47ff 100644
--- a/lib/model/QubitAuditLog.php
+++ b/lib/model/QubitAuditLog.php
@@ -7,6 +7,4 @@
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  */
-class QubitAuditLog extends BaseAuditLog
-{
-} // QubitAuditLog
+class QubitAuditLog extends BaseAuditLog {} // QubitAuditLog
diff --git a/lib/model/QubitClipboardSave.php b/lib/model/QubitClipboardSave.php
index 0f5a86a9ab..72fa87bd49 100644
--- a/lib/model/QubitClipboardSave.php
+++ b/lib/model/QubitClipboardSave.php
@@ -7,6 +7,4 @@
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  */
-class QubitClipboardSave extends BaseClipboardSave
-{
-} // QubitClipboardSave
+class QubitClipboardSave extends BaseClipboardSave {} // QubitClipboardSave
diff --git a/lib/model/QubitClipboardSaveItem.php b/lib/model/QubitClipboardSaveItem.php
index a1c5b350f7..81773a0df2 100644
--- a/lib/model/QubitClipboardSaveItem.php
+++ b/lib/model/QubitClipboardSaveItem.php
@@ -7,6 +7,4 @@
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  */
-class QubitClipboardSaveItem extends BaseClipboardSaveItem
-{
-} // QubitClipboardSaveItem
+class QubitClipboardSaveItem extends BaseClipboardSaveItem {} // QubitClipboardSaveItem
diff --git a/lib/model/QubitContactInformationI18n.php b/lib/model/QubitContactInformationI18n.php
index a3b6db7c0d..845663ffaf 100644
--- a/lib/model/QubitContactInformationI18n.php
+++ b/lib/model/QubitContactInformationI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitContactInformationI18n extends BaseContactInformationI18n
-{
-}
+class QubitContactInformationI18n extends BaseContactInformationI18n {}
diff --git a/lib/model/QubitDigitalObject.php b/lib/model/QubitDigitalObject.php
index 6ae8153494..bf4bccd30f 100644
--- a/lib/model/QubitDigitalObject.php
+++ b/lib/model/QubitDigitalObject.php
@@ -1276,7 +1276,7 @@ public function writeToFileSystem($asset, $options = [])
         $cleanFileName = self::sanitizeFilename($asset->getName());
 
         // If file has not extension, try to get it from asset mime type
-        if (0 == strlen(pathinfo($cleanFileName, PATHINFO_EXTENSION)) && null !== ($assetMimeType = $asset->mimeType) && 0 < strlen(($newFileExtension = array_search($assetMimeType, self::$qubitMimeTypes)))) {
+        if (0 == strlen(pathinfo($cleanFileName, PATHINFO_EXTENSION)) && null !== ($assetMimeType = $asset->mimeType) && 0 < strlen($newFileExtension = array_search($assetMimeType, self::$qubitMimeTypes))) {
             $cleanFileName .= '.'.$newFileExtension;
         }
 
@@ -3260,9 +3260,11 @@ protected static function returnBytes($val)
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
                 $val *= 1024;
+
                 // no break
             case 'm':
                 $val *= 1024;
+
                 // no break
             case 'k':
                 $val *= 1024;
@@ -3340,6 +3342,7 @@ private function file_get_contents_if_not_empty($filepath)
                 return $contents;
             }
         }
+
         // Return false on failure so CLI task will log an error and continue importing.
         return false;
     }
diff --git a/lib/model/QubitEventI18n.php b/lib/model/QubitEventI18n.php
index 743678e31a..62094116a8 100644
--- a/lib/model/QubitEventI18n.php
+++ b/lib/model/QubitEventI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitEventI18n extends BaseEventI18n
-{
-}
+class QubitEventI18n extends BaseEventI18n {}
diff --git a/lib/model/QubitFunctionObjectI18n.php b/lib/model/QubitFunctionObjectI18n.php
index 128d67cebe..db2632a1fc 100644
--- a/lib/model/QubitFunctionObjectI18n.php
+++ b/lib/model/QubitFunctionObjectI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitFunctionObjectI18n extends BaseFunctionObjectI18n
-{
-}
+class QubitFunctionObjectI18n extends BaseFunctionObjectI18n {}
diff --git a/lib/model/QubitGrantedRight.php b/lib/model/QubitGrantedRight.php
index 807bd2bcf7..86d5b5af4a 100644
--- a/lib/model/QubitGrantedRight.php
+++ b/lib/model/QubitGrantedRight.php
@@ -77,8 +77,8 @@ public static function checkPremis($id, $action, &$denyReason = null)
     /**
      * Get all the granted rights for a particular information object.
      *
-     * @param $id  The information object ID
-     * @param $actId  The optional ID for the act type (gets all types by default)
+     * @param $id    The information object ID
+     * @param $actId The optional ID for the act type (gets all types by default)
      *
      * @return array An array of QubitGrantedRight objects
      */
diff --git a/lib/model/QubitInformationObject.php b/lib/model/QubitInformationObject.php
index 9fecc1f15c..65e6fef4a8 100644
--- a/lib/model/QubitInformationObject.php
+++ b/lib/model/QubitInformationObject.php
@@ -117,6 +117,7 @@ public function __get($name)
                 }
 
                 return $this->identifier;
+
             // It may happen that the sourceStandard column is undefined, in that case
             // look up for the value in higher levels
             case 'sourceStandard':
@@ -1384,8 +1385,8 @@ public function setAccessPointByName($name, $options = [])
      * 2. Actors associated with this information object by relation (either subject or object)
      * 3. Actors that have the same name
      *
-     * @param $name  The name of the actor
-     * @param $options  an array of options filling in the new event or name access point info
+     * @param $name    The name of the actor
+     * @param $options an array of options filling in the new event or name access point info
      *
      * @return QubitActor the new or existing actor just added to the event/name access point list
      */
@@ -1499,7 +1500,7 @@ public function setActorByName($name, $options)
      * be amalgamated as text. Note that when EAD exported from AtoM the content
      * is exported in a p tag within the originalsloc tag.
      *
-     * @param $originalsNode  DOMNode  EAD originalsloc DOM node
+     * @param $originalsNode DOMNode  EAD originalsloc DOM node
      */
     public function importOriginalsLocationEadData($originalsNode)
     {
@@ -1523,7 +1524,7 @@ public function importOriginalsLocationEadData($originalsNode)
     /**
      * Import language-related data from a <langusage> tag in EAD2002.
      *
-     * @param $langusageNode  DOMNode  EAD langusage DOM node
+     * @param $langusageNode DOMNode  EAD langusage DOM node
      */
     public function importLangusageEadData($langusageNode)
     {
@@ -1579,7 +1580,7 @@ public function importLangusageEadData($langusageNode)
     /**
      * Import language-related data from a <langmaterial> tag in EAD2002.
      *
-     * @param $langmaterialNode  DOMNode  EAD langmaterial DOM node
+     * @param $langmaterialNode DOMNode  EAD langmaterial DOM node
      */
     public function importLangmaterialEadData($langmaterialNode)
     {
@@ -1653,7 +1654,7 @@ public function importDCLanguage($code)
     /**
      * Import creator data from an <origination> tag in EAD2002.
      *
-     * @param $node  DOMNode  EAD origination DOM node
+     * @param $node DOMNode  EAD origination DOM node
      */
     public function importOriginationEadData($node)
     {
@@ -1686,8 +1687,8 @@ public function importOriginationEadData($node)
     /**
      * Import creation-related data from an <bioghist> tag in EAD2002.
      *
-     * @param $biogHistNode  DOMNode  EAD bioghist DOM node
-     * @param $key Position of the current bioghist node
+     * @param $biogHistNode DOMNode  EAD bioghist DOM node
+     * @param $key          Position of the current bioghist node
      */
     public function importBioghistEadData($biogHistNode, $key)
     {
@@ -1802,7 +1803,7 @@ public function setLevelOfDescriptionByName($name)
     /**
      * Set publication status using a status name.
      *
-     * @param $name  valid publication status name
+     * @param $name valid publication status name
      */
     public function setPublicationStatusByName($name)
     {
@@ -1818,7 +1819,7 @@ public function setPublicationStatusByName($name)
     /**
      * Set description level of detail using a name.
      *
-     * @param $name  valid description detail level name
+     * @param $name valid description detail level name
      */
     public function setDescriptionLevelOfDetailByName($name)
     {
@@ -1832,7 +1833,7 @@ public function setDescriptionLevelOfDetailByName($name)
     /**
      * Set description status using a status name.
      *
-     * @param $name  valid publication status name
+     * @param $name valid publication status name
      */
     public function setDescriptionStatusByName($name)
     {
@@ -1846,9 +1847,9 @@ public function setDescriptionStatusByName($name)
     /**
      * Set term ID property using term name.
      *
-     * @param $property  object property to set
-     * @param $name  valid term name
-     * @param $taxonomyId  taxonomy ID
+     * @param $property   object property to set
+     * @param $name       valid term name
+     * @param $taxonomyId taxonomy ID
      */
     public function setTermIdPropertyUsingTermName($property, $name, $taxonomyId)
     {
@@ -2659,8 +2660,8 @@ private function removeKeymapEntries()
      * is related to this information object (either as a subject
      * or an object).
      *
-     * @param $name  The actor name
-     * @param $relatedBy  The relation type, either 'object' or 'subject'
+     * @param $name      The actor name
+     * @param $relatedBy The relation type, either 'object' or 'subject'
      *
      * @return QubitActor matching the specified parameters, null otherwise
      */
@@ -2694,7 +2695,7 @@ private function getActorByNameAndRelation($name, $relatedBy = 'object')
      * Returns an actor if one exists with the specified name and
      * who is also part of an event related to this information object.
      *
-     * @param $name  The actor name
+     * @param $name The actor name
      *
      * @return QubitActor matching the specified parameters, null otherwise
      */
@@ -2822,7 +2823,7 @@ private function parseChronlist($chronlistNodeList)
     /**
      * Returns a date string YYYY-MM-DD when given a date from an EAD <unitdate> @normal attribute.
      *
-     * @param $date  A date string from an EAD file, e.g. 19601103
+     * @param $date A date string from an EAD file, e.g. 19601103
      *
      * @return Will return a MySQL friendly YYYY-MM-DD date string (uses '-0' if missing a field)
      */
diff --git a/lib/model/QubitInformationObjectI18n.php b/lib/model/QubitInformationObjectI18n.php
index 52757ff556..66f68de553 100644
--- a/lib/model/QubitInformationObjectI18n.php
+++ b/lib/model/QubitInformationObjectI18n.php
@@ -22,6 +22,4 @@
  *
  * @see lib/model/om/BaseInformationObjectI18n.php
  */
-class QubitInformationObjectI18n extends BaseInformationObjectI18n
-{
-}
+class QubitInformationObjectI18n extends BaseInformationObjectI18n {}
diff --git a/lib/model/QubitJob.php b/lib/model/QubitJob.php
index f6e1e14f38..3761a32787 100644
--- a/lib/model/QubitJob.php
+++ b/lib/model/QubitJob.php
@@ -203,9 +203,9 @@ public function getNotes()
     /**
      * Generate a unique token property to associate unauthenticated users with jobs.
      *
-     * @throws sfException if a unique token can't be generated
-     *
      * @return QubitProperty generated user token property
+     *
+     * @throws sfException if a unique token can't be generated
      */
     public function generateUserTokenProperty()
     {
diff --git a/lib/model/QubitMenuI18n.php b/lib/model/QubitMenuI18n.php
index 6d7bd66a0e..331d56271d 100644
--- a/lib/model/QubitMenuI18n.php
+++ b/lib/model/QubitMenuI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitMenuI18n extends BaseMenuI18n
-{
-}
+class QubitMenuI18n extends BaseMenuI18n {}
diff --git a/lib/model/QubitNoteI18n.php b/lib/model/QubitNoteI18n.php
index b46876f5d7..7c7bd46ebe 100644
--- a/lib/model/QubitNoteI18n.php
+++ b/lib/model/QubitNoteI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitNoteI18n extends BaseNoteI18n
-{
-}
+class QubitNoteI18n extends BaseNoteI18n {}
diff --git a/lib/model/QubitOtherNameI18n.php b/lib/model/QubitOtherNameI18n.php
index b1be167258..2d77ed9eb8 100644
--- a/lib/model/QubitOtherNameI18n.php
+++ b/lib/model/QubitOtherNameI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitOtherNameI18n extends BaseOtherNameI18n
-{
-}
+class QubitOtherNameI18n extends BaseOtherNameI18n {}
diff --git a/lib/model/QubitPhysicalObject.php b/lib/model/QubitPhysicalObject.php
index 84f8bf8648..738591a3ea 100644
--- a/lib/model/QubitPhysicalObject.php
+++ b/lib/model/QubitPhysicalObject.php
@@ -297,7 +297,7 @@ public function updateInfobjRelations(array $relatedInfobjIds)
         }
     }
 
-    public function getRelationsAsArray(int $typeId = null)
+    public function getRelationsAsArray(?int $typeId = null)
     {
         if (empty($this->id)) {
             throw new sfException('Invalid QubitPhysicalObject id');
diff --git a/lib/model/QubitPhysicalObjectI18n.php b/lib/model/QubitPhysicalObjectI18n.php
index 6926e9cc9b..2222d9fa0d 100644
--- a/lib/model/QubitPhysicalObjectI18n.php
+++ b/lib/model/QubitPhysicalObjectI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitPhysicalObjectI18n extends BasePhysicalObjectI18n
-{
-}
+class QubitPhysicalObjectI18n extends BasePhysicalObjectI18n {}
diff --git a/lib/model/QubitPremisObject.php b/lib/model/QubitPremisObject.php
index 133c25949b..ecf20eb080 100644
--- a/lib/model/QubitPremisObject.php
+++ b/lib/model/QubitPremisObject.php
@@ -7,6 +7,4 @@
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  */
-class QubitPremisObject extends BasePremisObject
-{
-} // QubitPremisObject
+class QubitPremisObject extends BasePremisObject {} // QubitPremisObject
diff --git a/lib/model/QubitPropertyI18n.php b/lib/model/QubitPropertyI18n.php
index d9983832cb..67b84da00a 100644
--- a/lib/model/QubitPropertyI18n.php
+++ b/lib/model/QubitPropertyI18n.php
@@ -3,6 +3,4 @@
 /**
  * Subclass for representing a row from the 'q_property_i18n' table.
  */
-class QubitPropertyI18n extends BasePropertyI18n
-{
-}
+class QubitPropertyI18n extends BasePropertyI18n {}
diff --git a/lib/model/QubitRelationI18n.php b/lib/model/QubitRelationI18n.php
index 6e25fe0be1..238b955ad0 100644
--- a/lib/model/QubitRelationI18n.php
+++ b/lib/model/QubitRelationI18n.php
@@ -7,6 +7,4 @@
  * application requirements.  This class will only be generated as
  * long as it does not already exist in the output directory.
  */
-class QubitRelationI18n extends BaseRelationI18n
-{
-} // QubitRelationI18n
+class QubitRelationI18n extends BaseRelationI18n {} // QubitRelationI18n
diff --git a/lib/model/QubitRepository.php b/lib/model/QubitRepository.php
index 0f73294781..b0fd5cdb3c 100644
--- a/lib/model/QubitRepository.php
+++ b/lib/model/QubitRepository.php
@@ -503,7 +503,7 @@ protected function insert($connection = null)
      * the first one that has the field set.
      *
      * @param       $getFunction The get function for the field we want to return.
-     *                           e.g. getFromPrimaryOrFirstValidContact('getCity')
+     *                          e.g. getFromPrimaryOrFirstValidContact('getCity')
      * @param mixed $options
      *
      * @return mixed Returns the field if found, null otherwise
diff --git a/lib/model/QubitRepositoryI18n.php b/lib/model/QubitRepositoryI18n.php
index d040e5218c..0d6a910690 100644
--- a/lib/model/QubitRepositoryI18n.php
+++ b/lib/model/QubitRepositoryI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitRepositoryI18n extends BaseRepositoryI18n
-{
-}
+class QubitRepositoryI18n extends BaseRepositoryI18n {}
diff --git a/lib/model/QubitRightsHolder.php b/lib/model/QubitRightsHolder.php
index 724e9cd616..5ac5ff9d5c 100644
--- a/lib/model/QubitRightsHolder.php
+++ b/lib/model/QubitRightsHolder.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitRightsHolder extends BaseRightsHolder
-{
-}
+class QubitRightsHolder extends BaseRightsHolder {}
diff --git a/lib/model/QubitRightsI18n.php b/lib/model/QubitRightsI18n.php
index c1f4d44c80..17078f5a80 100644
--- a/lib/model/QubitRightsI18n.php
+++ b/lib/model/QubitRightsI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitRightsI18n extends BaseRightsI18n
-{
-}
+class QubitRightsI18n extends BaseRightsI18n {}
diff --git a/lib/model/QubitSettingI18n.php b/lib/model/QubitSettingI18n.php
index 614a4eabdd..84dfb1069d 100644
--- a/lib/model/QubitSettingI18n.php
+++ b/lib/model/QubitSettingI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitSettingI18n extends BaseSettingI18n
-{
-}
+class QubitSettingI18n extends BaseSettingI18n {}
diff --git a/lib/model/QubitSlug.php b/lib/model/QubitSlug.php
index f328d5c2a9..ed4f1444d1 100644
--- a/lib/model/QubitSlug.php
+++ b/lib/model/QubitSlug.php
@@ -28,12 +28,12 @@ class QubitSlug extends BaseSlug
     public const SLUG_RESTRICTIVE_CHARS = '0-9a-z-';
 
     // From RFC 3987 IRI allowed chars. Not guaranteed to match \p{L}\p{Nd}.
-    public const SLUG_RFC_3987_CHARS = "\u{00A0}-\u{D7FF}"."\u{F900}-\u{FDCF}"
-        ."\u{FDF0}-\u{FFEF}"."\u{10000}-\u{1FFFD}"."\u{20000}-\u{2FFFD}"
-        ."\u{30000}-\u{3FFFD}"."\u{40000}-\u{4FFFD}"."\u{50000}-\u{5FFFD}"
-        ."\u{60000}-\u{6FFFD}"."\u{70000}-\u{7FFFD}"."\u{80000}-\u{8FFFD}"
-        ."\u{90000}-\u{9FFFD}"."\u{A0000}-\u{AFFFD}"."\u{B0000}-\u{BFFFD}"
-        ."\u{C0000}-\u{CFFFD}"."\u{D0000}-\u{DFFFD}"."\u{E0000}-\u{EFFFD}";
+    public const SLUG_RFC_3987_CHARS = "\u{00A0}-\u{D7FF}\u{F900}-\u{FDCF}"
+        ."\u{FDF0}-\u{FFEF}\u{10000}-\u{1FFFD}\u{20000}-\u{2FFFD}"
+        ."\u{30000}-\u{3FFFD}\u{40000}-\u{4FFFD}\u{50000}-\u{5FFFD}"
+        ."\u{60000}-\u{6FFFD}\u{70000}-\u{7FFFD}\u{80000}-\u{8FFFD}"
+        ."\u{90000}-\u{9FFFD}\u{A0000}-\u{AFFFD}\u{B0000}-\u{BFFFD}"
+        ."\u{C0000}-\u{CFFFD}\u{D0000}-\u{DFFFD}\u{E0000}-\u{EFFFD}";
 
     public const SLUG_PERMISSIVE_CHARS = self::SLUG_RFC_3987_CHARS.'0-9A-Za-z-_~:;,=*@';
 
diff --git a/lib/model/QubitStaticPageI18n.php b/lib/model/QubitStaticPageI18n.php
index 77ea215b34..beb726d00f 100644
--- a/lib/model/QubitStaticPageI18n.php
+++ b/lib/model/QubitStaticPageI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitStaticPageI18n extends BaseStaticPageI18n
-{
-}
+class QubitStaticPageI18n extends BaseStaticPageI18n {}
diff --git a/lib/model/QubitTaxonomyI18n.php b/lib/model/QubitTaxonomyI18n.php
index f9bb4720aa..8011e5404f 100644
--- a/lib/model/QubitTaxonomyI18n.php
+++ b/lib/model/QubitTaxonomyI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitTaxonomyI18n extends BaseTaxonomyI18n
-{
-}
+class QubitTaxonomyI18n extends BaseTaxonomyI18n {}
diff --git a/lib/model/QubitTerm.php b/lib/model/QubitTerm.php
index 80ea8607a8..8e5e0cfa85 100644
--- a/lib/model/QubitTerm.php
+++ b/lib/model/QubitTerm.php
@@ -766,6 +766,7 @@ public function getChildren($options = [])
             case 'name':
                 $criteria = QubitCultureFallback::addFallbackCriteria($criteria, 'QubitTerm');
                 $criteria->addAscendingOrderByColumn('name');
+
                 // no break
             case 'lft':
             default:
diff --git a/lib/model/QubitTermI18n.php b/lib/model/QubitTermI18n.php
index 7d1d6a7d45..d605f924fd 100644
--- a/lib/model/QubitTermI18n.php
+++ b/lib/model/QubitTermI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitTermI18n extends BaseTermI18n
-{
-}
+class QubitTermI18n extends BaseTermI18n {}
diff --git a/lib/sitemap/AbstractSitemapUrl.class.php b/lib/sitemap/AbstractSitemapUrl.class.php
index 3aa261fc03..14f32c5648 100644
--- a/lib/sitemap/AbstractSitemapUrl.class.php
+++ b/lib/sitemap/AbstractSitemapUrl.class.php
@@ -64,9 +64,7 @@ protected function getLoc()
         return '/'.$this->slug;
     }
 
-    protected function getPriority()
-    {
-    }
+    protected function getPriority() {}
 
     protected function getLastmod()
     {
diff --git a/lib/task/export/exportBulkBaseTask.class.php b/lib/task/export/exportBulkBaseTask.class.php
index 06a15e9824..72a40af8cb 100644
--- a/lib/task/export/exportBulkBaseTask.class.php
+++ b/lib/task/export/exportBulkBaseTask.class.php
@@ -109,9 +109,9 @@ public static function captureResourceExportTemplateOutput($resource, $format, $
     /**
      * Generate a suitable file name for export files.
      *
-     * @param $resource  The information object we're exporting
-     * @param $extension  The file extension (e.g. csv, xml)
-     * @param $formatAbbreviation  The type of export format (e.g. ead, eac, mods)
+     * @param $resource           The information object we're exporting
+     * @param $extension          The file extension (e.g. csv, xml)
+     * @param $formatAbbreviation The type of export format (e.g. ead, eac, mods)
      *
      * @return string The generated filename based on the format, info object id, slug, and extension
      */
diff --git a/lib/task/import/csvAuthorityRecordImportTask.class.php b/lib/task/import/csvAuthorityRecordImportTask.class.php
index ee3a4271f9..120f7c4dc2 100644
--- a/lib/task/import/csvAuthorityRecordImportTask.class.php
+++ b/lib/task/import/csvAuthorityRecordImportTask.class.php
@@ -223,8 +223,7 @@ public function execute($arguments = [], $options = [])
                                     '%1%' => sfConfig::get('app_ui_label_actor'),
                                     '%2%' => $identifier,
                                 ]
-                            )
-                        ;
+                            );
 
                         if (sfConfig::get('app_prevent_duplicate_actor_identifiers', false)) {
                             $error .= sfContext::getInstance()->i18n->__(' Import aborted.');
diff --git a/lib/task/import/csvEventImportTask.class.php b/lib/task/import/csvEventImportTask.class.php
index 5a4f9496a6..d60a3a0f64 100644
--- a/lib/task/import/csvEventImportTask.class.php
+++ b/lib/task/import/csvEventImportTask.class.php
@@ -223,7 +223,7 @@ function getNameIdArrayFromTable(&$self, $tableName, $keyColumn, $idColumn, $whe
     if (!$statement) {
         echo 'DB error';
 
-        exit();
+        exit;
     }
 
     while ($subject = $statement->fetch(PDO::FETCH_OBJ)) {
diff --git a/lib/task/import/csvImportBaseTask.class.php b/lib/task/import/csvImportBaseTask.class.php
index 5b93302e13..04a001b47e 100644
--- a/lib/task/import/csvImportBaseTask.class.php
+++ b/lib/task/import/csvImportBaseTask.class.php
@@ -281,8 +281,7 @@ public static function importEvents(&$import)
                     'type' => 'eventTypes',
                     'place' => 'eventPlaces',
                 ],
-            ]
-            as $version => $propertyColumns
+            ] as $version => $propertyColumns
         ) {
             // Get event data if one of the columns is populated in the current index
             $index = 0;
diff --git a/lib/task/import/importDipObjectsTask.class.php b/lib/task/import/importDipObjectsTask.class.php
index 90f9276929..0fdb1b72bf 100644
--- a/lib/task/import/importDipObjectsTask.class.php
+++ b/lib/task/import/importDipObjectsTask.class.php
@@ -83,7 +83,7 @@ public function getRowColumnValue($column, $row)
     {
         // Return cached column index, if present
         if (isset($this->columnIndexes[$column])) {
-            return $row[($this->columnIndexes[$column])];
+            return $row[$this->columnIndexes[$column]];
         }
 
         // Determine column index and cache
diff --git a/lib/task/import/validate/csvDigitalObjectUriValidator.class.php b/lib/task/import/validate/csvDigitalObjectUriValidator.class.php
index d2dc1a4425..b999394922 100644
--- a/lib/task/import/validate/csvDigitalObjectUriValidator.class.php
+++ b/lib/task/import/validate/csvDigitalObjectUriValidator.class.php
@@ -138,7 +138,7 @@ private function getInvalidUris()
 
             $parsedUri = parse_url($uri);
 
-            if (('https' != $parsedUri['scheme'] && 'http' != $parsedUri['scheme'])) {
+            if ('https' != $parsedUri['scheme'] && 'http' != $parsedUri['scheme']) {
                 array_push($invalidUris, $uri);
             }
         }
diff --git a/lib/task/migrate/QubitMigrate.class.php b/lib/task/migrate/QubitMigrate.class.php
index f850f6d9ec..5b49ed9d02 100644
--- a/lib/task/migrate/QubitMigrate.class.php
+++ b/lib/task/migrate/QubitMigrate.class.php
@@ -193,7 +193,7 @@ public static function sortByLft(&$objectList)
     /**
      * Recursively delete a hierarchical data tree.
      *
-     * @param $objectList array full dataset
+     * @param $objectList      array full dataset
      * @param $deleteObjectKey string key of array object to delete
      */
     public static function cascadeDelete($objectList, $deleteObjectKey)
@@ -515,6 +515,7 @@ public static function dropColumn($table, $column)
                         }
 
                         break;
+
                     // Foreign keys
                     case 'CONSTRAINT':
                         // Build array with DROP FOREIGN KEY commands
diff --git a/lib/task/migrate/QubitMigrate103.class.php b/lib/task/migrate/QubitMigrate103.class.php
index f00e7c320d..09be4933e4 100644
--- a/lib/task/migrate/QubitMigrate103.class.php
+++ b/lib/task/migrate/QubitMigrate103.class.php
@@ -738,7 +738,7 @@ protected function sortQubitInformationObjects()
     protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'SUBJECT_ID',
             'CUSTODY_ID',
@@ -746,38 +746,38 @@ protected function sortQubitTerms()
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
             'SCOPE_NOTE_ID',
             'DISPLAY_NOTE_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'FINDING_AIDS_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
         ];
 
diff --git a/lib/task/migrate/QubitMigrate104.class.php b/lib/task/migrate/QubitMigrate104.class.php
index f93573a85f..b404ccfe03 100644
--- a/lib/task/migrate/QubitMigrate104.class.php
+++ b/lib/task/migrate/QubitMigrate104.class.php
@@ -232,7 +232,7 @@ protected function alterQubitMenus()
             'parent_id' => 'QubitMenu_mainmenu',
             'source_culture' => 'en',
             'name' => 'admin',
-            'label' => ['de' => 'Administrator', 'en' => 'admin', 'es' => 'administrador', 'fa' => 'مدير', 'fr' => 'administrer', 'it' => 'amministra',  'sl' => 'administrator'],
+            'label' => ['de' => 'Administrator', 'en' => 'admin', 'es' => 'administrador', 'fa' => 'مدير', 'fr' => 'administrer', 'it' => 'amministra', 'sl' => 'administrator'],
             'path' => 'user/list',
         ];
         $this->data['QubitMenu']['QubitMenu_mainmenu_addedit_informationobject'] = [
@@ -469,7 +469,7 @@ protected function sortQubitInformationObjects()
     protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'SUBJECT_ID',
             'CUSTODY_ID',
@@ -477,7 +477,7 @@ protected function sortQubitTerms()
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -486,32 +486,32 @@ protected function sortQubitTerms()
             'ARCHIVIST_NOTE_ID',
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
         ];
 
diff --git a/lib/task/migrate/QubitMigrate105.class.php b/lib/task/migrate/QubitMigrate105.class.php
index 7e0e2f921d..b11b00e676 100644
--- a/lib/task/migrate/QubitMigrate105.class.php
+++ b/lib/task/migrate/QubitMigrate105.class.php
@@ -247,7 +247,7 @@ protected function sortQubitInformationObjects()
     protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'SUBJECT_ID',
             'CUSTODY_ID',
@@ -255,7 +255,7 @@ protected function sortQubitTerms()
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -264,34 +264,34 @@ protected function sortQubitTerms()
             'ARCHIVIST_NOTE_ID',
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
         ];
diff --git a/lib/task/migrate/QubitMigrate106.class.php b/lib/task/migrate/QubitMigrate106.class.php
index e9f0b8a2a8..43e966a433 100644
--- a/lib/task/migrate/QubitMigrate106.class.php
+++ b/lib/task/migrate/QubitMigrate106.class.php
@@ -522,7 +522,7 @@ protected function sortQubitInformationObjects()
     protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'SUBJECT_ID',
             'CUSTODY_ID',
@@ -530,7 +530,7 @@ protected function sortQubitTerms()
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -539,34 +539,34 @@ protected function sortQubitTerms()
             'ARCHIVIST_NOTE_ID',
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
         ];
diff --git a/lib/task/migrate/QubitMigrate107.class.php b/lib/task/migrate/QubitMigrate107.class.php
index 725dfe76f1..5bf3c1d6fe 100644
--- a/lib/task/migrate/QubitMigrate107.class.php
+++ b/lib/task/migrate/QubitMigrate107.class.php
@@ -613,7 +613,7 @@ protected function alterQubitMenus()
         ];
 
         // Add user and group sub-menus
-        if (null !== ($userMenuKey = ($this->getRowKey('QubitMenu', 'name', 'users')))) {
+        if (null !== ($userMenuKey = $this->getRowKey('QubitMenu', 'name', 'users'))) {
             $this->data['QubitMenu']['QubitMenu_mainmenu_admin_users_users'] = [
                 'parent_id' => $userMenuKey,
                 'source_culture' => 'en',
@@ -631,7 +631,7 @@ protected function alterQubitMenus()
         }
 
         // Update path for home page
-        if (null !== ($menuKey = ($this->getRowKey('QubitMenu', 'name', 'home')))) {
+        if (null !== ($menuKey = $this->getRowKey('QubitMenu', 'name', 'home'))) {
             $this->data['QubitMenu'][$menuKey]['path'] = 'staticpage/static?permalink=homepage';
         }
 
@@ -996,14 +996,14 @@ protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
             'ROOT_ID',
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'CUSTODY_ID',
             'PUBLICATION_ID',
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -1012,48 +1012,48 @@ protected function sortQubitTerms()
             'ARCHIVIST_NOTE_ID',
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
-            //Actor relation type taxonomy
+            // Actor relation type taxonomy
             'HIERARCHICAL_RELATION_ID',
             'TEMPORAL_RELATION_ID',
             'FAMILY_RELATION_ID',
             'ASSOCIATIVE_RELATION_ID',
-            //Relation NOTE type taxonomy
+            // Relation NOTE type taxonomy
             'RELATION_NOTE_DESCRIPTION_ID',
             'RELATION_NOTE_DATE_DISPLAY_ID',
-            //Term relation taxonomy
+            // Term relation taxonomy
             'TERM_RELATION_EQUIVALENCE_ID',
             'TERM_RELATION_ASSOCIATIVE_ID',
-            //Status types taxonomy
+            // Status types taxonomy
             'STATUS_TYPE_PUBLICATION_ID',
             // Publication status taxonomy
             'PUBLICATION_STATUS_DRAFT_ID',
diff --git a/lib/task/migrate/QubitMigrate108.class.php b/lib/task/migrate/QubitMigrate108.class.php
index 7e8279e188..e1b2938bf1 100644
--- a/lib/task/migrate/QubitMigrate108.class.php
+++ b/lib/task/migrate/QubitMigrate108.class.php
@@ -1479,14 +1479,14 @@ protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
             'ROOT_ID',
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'CUSTODY_ID',
             'PUBLICATION_ID',
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -1495,49 +1495,49 @@ protected function sortQubitTerms()
             'ARCHIVIST_NOTE_ID',
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'EXTERNAL_URI_ID',
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
-            //Actor relation type taxonomy
+            // Actor relation type taxonomy
             'HIERARCHICAL_RELATION_ID',
             'TEMPORAL_RELATION_ID',
             'FAMILY_RELATION_ID',
             'ASSOCIATIVE_RELATION_ID',
-            //Relation NOTE type taxonomy
+            // Relation NOTE type taxonomy
             'RELATION_NOTE_DESCRIPTION_ID',
             'RELATION_NOTE_DATE_DISPLAY_ID',
-            //Term relation taxonomy
+            // Term relation taxonomy
             'TERM_RELATION_EQUIVALENCE_ID',
             'TERM_RELATION_ASSOCIATIVE_ID',
-            //Status types taxonomy
+            // Status types taxonomy
             'STATUS_TYPE_PUBLICATION_ID',
             // Publication status taxonomy
             'PUBLICATION_STATUS_DRAFT_ID',
diff --git a/lib/task/migrate/QubitMigrate109.class.php b/lib/task/migrate/QubitMigrate109.class.php
index 18386b359e..73688b7dc7 100644
--- a/lib/task/migrate/QubitMigrate109.class.php
+++ b/lib/task/migrate/QubitMigrate109.class.php
@@ -699,14 +699,14 @@ protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
             'ROOT_ID',
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'CUSTODY_ID',
             'PUBLICATION_ID',
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -716,48 +716,48 @@ protected function sortQubitTerms()
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
             'MAINTENANCE_NOTE_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
-            //Actor relation type taxonomy
+            // Actor relation type taxonomy
             'HIERARCHICAL_RELATION_ID',
             'TEMPORAL_RELATION_ID',
             'FAMILY_RELATION_ID',
             'ASSOCIATIVE_RELATION_ID',
-            //Relation NOTE type taxonomy
+            // Relation NOTE type taxonomy
             'RELATION_NOTE_DESCRIPTION_ID',
             'RELATION_NOTE_DATE_ID',
-            //Term relation taxonomy
+            // Term relation taxonomy
             'ALTERNATIVE_LABEL_ID',
             'TERM_RELATION_ASSOCIATIVE_ID',
-            //Status types taxonomy
+            // Status types taxonomy
             'STATUS_TYPE_PUBLICATION_ID',
             // Publication status taxonomy
             'PUBLICATION_STATUS_DRAFT_ID',
diff --git a/lib/task/migrate/QubitMigrate110.class.php b/lib/task/migrate/QubitMigrate110.class.php
index 80e2007b10..01826a2344 100644
--- a/lib/task/migrate/QubitMigrate110.class.php
+++ b/lib/task/migrate/QubitMigrate110.class.php
@@ -961,14 +961,14 @@ protected function sortQubitTerms()
     {
         $qubitTermConstantIds = [
             'ROOT_ID',
-            //EventType taxonomy
+            // EventType taxonomy
             'CREATION_ID',
             'CUSTODY_ID',
             'PUBLICATION_ID',
             'CONTRIBUTION_ID',
             'COLLECTION_ID',
             'ACCUMULATION_ID',
-            //NoteType taxonomy
+            // NoteType taxonomy
             'TITLE_NOTE_ID',
             'PUBLICATION_NOTE_ID',
             'SOURCE_NOTE_ID',
@@ -978,48 +978,48 @@ protected function sortQubitTerms()
             'GENERAL_NOTE_ID',
             'OTHER_DESCRIPTIVE_DATA_ID',
             'MAINTENANCE_NOTE_ID',
-            //CollectionType taxonomy
+            // CollectionType taxonomy
             'ARCHIVAL_MATERIAL_ID',
             'PUBLISHED_MATERIAL_ID',
             'ARTEFACT_MATERIAL_ID',
-            //ActorEntityType taxonomy
+            // ActorEntityType taxonomy
             'CORPORATE_BODY_ID',
             'PERSON_ID',
             'FAMILY_ID',
-            //OtherNameType taxonomy
+            // OtherNameType taxonomy
             'FAMILY_NAME_FIRST_NAME_ID',
-            //MediaType taxonomy
+            // MediaType taxonomy
             'AUDIO_ID',
             'IMAGE_ID',
             'TEXT_ID',
             'VIDEO_ID',
             'OTHER_ID',
-            //Digital Object Usage taxonomy
+            // Digital Object Usage taxonomy
             'MASTER_ID',
             'REFERENCE_ID',
             'THUMBNAIL_ID',
             'COMPOUND_ID',
-            //Physical Object Type taxonomy
+            // Physical Object Type taxonomy
             'LOCATION_ID',
             'CONTAINER_ID',
             'ARTEFACT_ID',
-            //Relation Type taxonomy
+            // Relation Type taxonomy
             'HAS_PHYSICAL_OBJECT_ID',
-            //Actor name type taxonomy
+            // Actor name type taxonomy
             'PARALLEL_FORM_OF_NAME_ID',
             'OTHER_FORM_OF_NAME_ID',
-            //Actor relation type taxonomy
+            // Actor relation type taxonomy
             'HIERARCHICAL_RELATION_ID',
             'TEMPORAL_RELATION_ID',
             'FAMILY_RELATION_ID',
             'ASSOCIATIVE_RELATION_ID',
-            //Relation NOTE type taxonomy
+            // Relation NOTE type taxonomy
             'RELATION_NOTE_DESCRIPTION_ID',
             'RELATION_NOTE_DATE_ID',
-            //Term relation taxonomy
+            // Term relation taxonomy
             'ALTERNATIVE_LABEL_ID',
             'TERM_RELATION_ASSOCIATIVE_ID',
-            //Status types taxonomy
+            // Status types taxonomy
             'STATUS_TYPE_PUBLICATION_ID',
             // Publication status taxonomy
             'PUBLICATION_STATUS_DRAFT_ID',
diff --git a/lib/task/migrate/arUpgradeSqlTask.class.php b/lib/task/migrate/arUpgradeSqlTask.class.php
index 8ca1d41d13..55cfe3af08 100644
--- a/lib/task/migrate/arUpgradeSqlTask.class.php
+++ b/lib/task/migrate/arUpgradeSqlTask.class.php
@@ -163,8 +163,7 @@ protected function execute($arguments = [], $options = [])
                     ->maxdepth(0)
                     ->sort_by_name()
                     ->name('arUpgrader*.class.php')
-                    ->in(sfConfig::get('sf_lib_dir').'/task/migrate')
-                as $filename
+                    ->in(sfConfig::get('sf_lib_dir').'/task/migrate') as $filename
             ) {
                 $className = preg_replace('/.*(arUpgrader\d+).*/', '$1', $filename);
                 $class = new $className();
@@ -546,8 +545,7 @@ private function runMigrationsInDirectory($version, $migrationsDirectory, $previ
                 ->maxdepth(0)
                 ->sort_by_name()
                 ->name('arMigration*.class.php')
-                ->in($migrationsDirectory)
-            as $filename
+                ->in($migrationsDirectory) as $filename
         ) {
             // Initialize migration class
             $className = preg_replace('/.*(arMigration\d+).*/', '$1', $filename);
@@ -698,7 +696,7 @@ private function getNewTheme($themes)
     /**
      * Get plugins that are currently present in the plugins/ directory.
      *
-     * @param $themePluginsOnly  Whether to get all plugins or just theme plugins
+     * @param $themePluginsOnly Whether to get all plugins or just theme plugins
      *
      * @return array An array containing the theme names and paths ($name => $path)
      */
diff --git a/lib/task/migrate/arUpgrader110.class.php b/lib/task/migrate/arUpgrader110.class.php
index 3595c5fd05..8c3ca1c126 100644
--- a/lib/task/migrate/arUpgrader110.class.php
+++ b/lib/task/migrate/arUpgrader110.class.php
@@ -75,8 +75,7 @@ public function up($version, $configuration, $options)
                         'fr' => 'Registre des entrées',
                         'pl' => 'Nabytki',
                         'sl' => 'Zapisi o prevzemu',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -108,8 +107,7 @@ public function up($version, $configuration, $options)
                         'fr' => 'Gérer',
                         'pl' => 'Zarządzanie',
                         'sl' => 'Upravljaj',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -145,8 +143,7 @@ public function up($version, $configuration, $options)
                         'fr' => 'Registre des entrées',
                         'pl' => 'Nabytki',
                         'sl' => 'Zapisi o prevzemu',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -177,8 +174,7 @@ public function up($version, $configuration, $options)
                         'nl' => 'Schenkers',
                         'pl' => 'Przekazujący (materiały archiwalne)',
                         'sl' => 'Donatorji',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -209,8 +205,7 @@ public function up($version, $configuration, $options)
                         'nl' => 'Houders van rechten',
                         'pl' => 'Posiadacze praw',
                         'sl' => 'Imetniki pravic',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -269,8 +264,7 @@ public function up($version, $configuration, $options)
                         'Public transfer',
                         'Private transfer',
                         'Acquisition type',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -294,8 +288,7 @@ public function up($version, $configuration, $options)
                         'Gift',
                         'Purchase',
                         'Transfer',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -318,8 +311,7 @@ public function up($version, $configuration, $options)
                         'High',
                         'Medium',
                         'Low',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -342,8 +334,7 @@ public function up($version, $configuration, $options)
                         'Complete',
                         'Incomplete',
                         'In-Progress',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -365,8 +356,7 @@ public function up($version, $configuration, $options)
                     [
                         'Whole',
                         'Part',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -393,8 +383,7 @@ public function up($version, $configuration, $options)
                         'Migrate',
                         'Modify',
                         'Replicate',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -419,8 +408,7 @@ public function up($version, $configuration, $options)
                         'Statute',
                         'Policy',
                         'Donor',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -443,8 +431,7 @@ public function up($version, $configuration, $options)
                         'Under copyright',
                         'Public domain',
                         'Unknown',
-                    ]
-                    as $item
+                    ] as $item
                 ) {
                     $term = new QubitTerm();
                     $term->parentId = QubitTerm::ROOT_ID;
@@ -455,6 +442,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Migrate relation notes for date and description to relation_i18n table
             case 63:
                 $sql = sprintf(
@@ -494,6 +482,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Prior to r9340 all checksums were md5 and the algorithm was not
             // recorded, update checksum_type column
             case 64:
@@ -503,6 +492,7 @@ public function up($version, $configuration, $options)
                 QubitPdo::modify($sql);
 
                 break;
+
             // Add importCsv menu node, see also r9373
             case 65:
                 $node = new QubitMenu();
@@ -513,6 +503,7 @@ public function up($version, $configuration, $options)
                 $node->save();
 
                 break;
+
             // Add global replace menu node
             case 66:
                 $node = new QubitMenu();
@@ -523,6 +514,7 @@ public function up($version, $configuration, $options)
                 $node->save();
 
                 break;
+
             // Add setting for repository upload quota
             case 67:
                 $setting = new QubitSetting();
@@ -532,6 +524,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add separator character setting
             case 68:
                 $setting = new QubitSetting();
@@ -541,6 +534,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add themes menu and update plugins menu path
             case 69:
                 $node = new QubitMenu();
@@ -556,8 +550,7 @@ public function up($version, $configuration, $options)
                         'nl' => 'Thema\'s',
                         'pl' => 'Motywy',
                         'sl' => 'Teme',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -579,6 +572,7 @@ public function up($version, $configuration, $options)
                 $node->save();
 
                 break;
+
             // Move digital objects to repository specific paths like r9503
             case 70:
                 if (!file_exists(sfConfig::get('sf_upload_dir').'/r')) {
@@ -663,12 +657,14 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Add default value for repository.upload_limit column
             case 71:
                 $sql = 'UPDATE '.QubitRepository::TABLE_NAME.' SET upload_limit = -1';
                 QubitPdo::modify($sql);
 
                 break;
+
             // Add physical object menu
             case 72:
                 $node = new QubitMenu();
@@ -684,8 +680,7 @@ public function up($version, $configuration, $options)
                         'nl' => 'Bergplaats',
                         'pl' => 'Składowanie w ujęciu fizycznym',
                         'sl' => 'Fizična hramba',
-                    ]
-                    as $key => $value
+                    ] as $key => $value
                 ) {
                     $nodeI18n = new QubitMenuI18n();
                     $nodeI18n->culture = $key;
@@ -702,6 +697,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Migrate to sfCaribou theme to users that are currently using sfClassic
             case 73:
                 if (null !== $setting = QubitSetting::getByName('plugins')) {
@@ -724,6 +720,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Ensure all information objects get an explicit publication status
             case 74:
                 $sql = 'SELECT id
@@ -755,6 +752,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Return false if no upgrade available
             default:
                 return false;
@@ -834,8 +832,7 @@ public function updateSchema($configuration)
                 'rights_actor_relation',
                 'rights_term_relation',
                 'system_event',
-            ]
-            as $item
+            ] as $item
         ) {
             QubitMigrate::dropTable($item);
         }
@@ -848,8 +845,7 @@ public function updateSchema($configuration)
                 'property',
                 'status',
                 'taxonomy',
-            ]
-            as $item
+            ] as $item
         ) {
             // Copy column updated_at and drop it
             $sql = "UPDATE object, {$item}";
diff --git a/lib/task/migrate/arUpgrader120.class.php b/lib/task/migrate/arUpgrader120.class.php
index 1c31830c09..cbdaca9263 100644
--- a/lib/task/migrate/arUpgrader120.class.php
+++ b/lib/task/migrate/arUpgrader120.class.php
@@ -42,6 +42,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add SWORD deposit directory setting
             case 76:
                 $setting = new QubitSetting();
@@ -52,6 +53,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add security settings
             case 77:
                 $setting = new QubitSetting();
@@ -73,6 +75,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add browse sort settings
             case 78:
                 $setting = new QubitSetting();
@@ -88,6 +91,7 @@ public function up($version, $configuration, $options)
                 $setting->save();
 
                 break;
+
             // Add 'Language note' term
             case 79:
                 QubitMigrate::bumpTerm(QubitTerm::LANGUAGE_NOTE_ID, $configuration);
@@ -100,12 +104,14 @@ public function up($version, $configuration, $options)
                 $term->save();
 
                 break;
+
             // Add 'active' column to user table
             case 80:
                 // NOTE: ALTER automatically sets `active`=1 (the DEFAULT) for existing rows
                 QubitMigrate::addColumn(QubitUser::TABLE_NAME, 'active TINYINT DEFAULT 1', ['after' => 'salt']);
 
                 break;
+
             // Use repository slug instead of id in acl_permission conditionals,
             // (r10996)
             case 81:
@@ -153,6 +159,7 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Increase VARCHAR column limit to 1024 to avoid truncating long strings
             // Issue 1628
             case 82:
@@ -258,12 +265,14 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Increase width of digital_object.mime_type to 255 chars
             case 83:
                 $sql = 'ALTER TABLE '.QubitDigitalObject::TABLE_NAME.' MODIFY `mime_type` VARCHAR(255);';
                 QubitPdo::modify($sql);
 
                 break;
+
             // Add accrual constant to term table
             case 84:
                 QubitMigrate::bumpTerm(QubitTerm::ACCRUAL_ID, $configuration);
@@ -276,6 +285,7 @@ public function up($version, $configuration, $options)
                 $term->save();
 
                 break;
+
             // Fix typo: r11890
             case 85:
                 $sql = 'UPDATE '.QubitTermI18n::TABLE_NAME;
@@ -285,6 +295,7 @@ public function up($version, $configuration, $options)
                 QubitPdo::modify($sql);
 
                 break;
+
             // Fix issue 2344
             case 86:
                 // Type of relation: right
@@ -324,18 +335,21 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Change property name from dipUUID to aipUUID
             case 87:
                 $sql = 'UPDATE '.QubitProperty::TABLE_NAME.' SET name = "aipUUID" WHERE name = "dipUUID"';
                 QubitPdo::modify($sql);
 
                 break;
+
             // According to r10747, keymap.source_id changed from INTEGER to TEXT
             case 88:
                 $sql = 'ALTER TABLE '.QubitKeymap::TABLE_NAME.' CHANGE source_id source_id TEXT';
                 QubitPdo::modify($sql);
 
                 break;
+
             // Add "Visible elements" assets
             case 89:
                 $elements = [
@@ -399,17 +413,20 @@ public function up($version, $configuration, $options)
                 }
 
                 break;
+
             // Make property_i18n.value field TEXT to accommodate pdf text (r12026)
             case 90:
                 $sql = 'ALTER TABLE `property_i18n` MODIFY `value` TEXT;';
                 QubitPdo::modify($sql);
 
                 break;
+
             // Update translations from fixtures
             case 91:
                 QubitMigrate::addNewFixtureI18ns();
 
                 break;
+
             // Return false if no upgrade available
             default:
                 return false;
diff --git a/lib/task/migrate/migrations/arMigration0094.class.php b/lib/task/migrate/migrations/arMigration0094.class.php
index 225d132fe4..2a7551e9ac 100644
--- a/lib/task/migrate/migrations/arMigration0094.class.php
+++ b/lib/task/migrate/migrations/arMigration0094.class.php
@@ -69,8 +69,7 @@ public function up($configuration)
                 'dc' => 'Dublin Core, Version 1.1. Dublin Core Metadata Initiative',
                 'mods' => 'MODS, Version 3.3. U.S. Library of Congress',
                 'rad' => 'RAD, July 2008 version. Canadian Council of Archives',
-            ]
-            as $key => $value
+            ] as $key => $value
         ) {
             $term = new QubitTerm();
             $term->parentId = QubitTerm::ROOT_ID;
diff --git a/lib/task/migrate/migrations/arMigration0099.class.php b/lib/task/migrate/migrations/arMigration0099.class.php
index d90087d162..e9eec0c156 100644
--- a/lib/task/migrate/migrations/arMigration0099.class.php
+++ b/lib/task/migrate/migrations/arMigration0099.class.php
@@ -41,8 +41,7 @@ public function up($configuration)
             [
                 'taxonomies' => 'taxonomy/browse',
                 'browseDigitalObjects' => 'digitalobject/browse',
-            ]
-            as $key => $value
+            ] as $key => $value
         ) {
             if (null !== $menu = QubitMenu::getByName($key)) {
                 $menu->path = $value;
diff --git a/lib/task/migrate/migrations/arMigration0105.class.php b/lib/task/migrate/migrations/arMigration0105.class.php
index 5ead5d2f63..ae3732e64d 100644
--- a/lib/task/migrate/migrations/arMigration0105.class.php
+++ b/lib/task/migrate/migrations/arMigration0105.class.php
@@ -77,8 +77,7 @@ public function up($configuration)
                     'is the associate of' => 'itself',
                     'is the friend of' => 'itself',
                 ],
-            ]
-            as $parentId => $terms
+            ] as $parentId => $terms
         ) {
             foreach ($terms as $termName => $converseTermName) {
                 $term = new QubitTerm();
diff --git a/lib/task/migrate/migrations/arMigration0106.class.php b/lib/task/migrate/migrations/arMigration0106.class.php
index 020a0dafe5..02ca79cb3e 100644
--- a/lib/task/migrate/migrations/arMigration0106.class.php
+++ b/lib/task/migrate/migrations/arMigration0106.class.php
@@ -74,8 +74,7 @@ public function up($configuration)
                     'is the associate of' => 'itself',
                     'is the friend of' => 'itself',
                 ],
-            ]
-            as $parentId => $terms
+            ] as $parentId => $terms
         ) {
             foreach ($terms as $termName => $converseTermName) {
                 // Obtain/create object term
diff --git a/lib/task/migrate/migrations/arMigration0108.class.php b/lib/task/migrate/migrations/arMigration0108.class.php
index 23c1354271..f609cfe558 100644
--- a/lib/task/migrate/migrations/arMigration0108.class.php
+++ b/lib/task/migrate/migrations/arMigration0108.class.php
@@ -97,8 +97,7 @@ public function up($configuration)
                 QubitTerm::ARTWORK_MATERIAL_ID => 'Artwork material',
                 QubitTerm::SUPPORTING_DOCUMENTATION_ID => 'Supporting documentation',
                 QubitTerm::SUPPORTING_TECHNOLOGY_ID => 'Supporting technology',
-            ]
-            as $id => $value
+            ] as $id => $value
         ) {
             QubitMigrate::bumpTerm($id, $configuration);
             $term = new QubitTerm();
diff --git a/lib/task/migrate/migrations/arMigration0109.class.php b/lib/task/migrate/migrations/arMigration0109.class.php
index b70e93be1e..5afe90a093 100644
--- a/lib/task/migrate/migrations/arMigration0109.class.php
+++ b/lib/task/migrate/migrations/arMigration0109.class.php
@@ -60,31 +60,30 @@ public function up($configuration)
         // Add the "Thematic Areas" terms
         foreach (
             [
-                ['en' => 'Aboriginal Peoples',                   'fr' => 'Peuples autochtones'],
-                ['en' => 'Agriculture',                          'fr' => 'Agriculture'],
-                ['en' => 'Arts and Culture',                     'fr' => 'Arts et culture'],
-                ['en' => 'Communication',                        'fr' => 'Communication'],
-                ['en' => 'Education',                            'fr' => 'Éducation'],
-                ['en' => 'Environment',                          'fr' => 'Environnement'],
-                ['en' => 'Family / Domestic Life',               'fr' => 'Vie privée'],
-                ['en' => 'Genealogical',                         'fr' => 'Généalogique'],
-                ['en' => 'Geography',                            'fr' => 'Géographie'],
+                ['en' => 'Aboriginal Peoples', 'fr' => 'Peuples autochtones'],
+                ['en' => 'Agriculture', 'fr' => 'Agriculture'],
+                ['en' => 'Arts and Culture', 'fr' => 'Arts et culture'],
+                ['en' => 'Communication', 'fr' => 'Communication'],
+                ['en' => 'Education', 'fr' => 'Éducation'],
+                ['en' => 'Environment', 'fr' => 'Environnement'],
+                ['en' => 'Family / Domestic Life', 'fr' => 'Vie privée'],
+                ['en' => 'Genealogical', 'fr' => 'Généalogique'],
+                ['en' => 'Geography', 'fr' => 'Géographie'],
                 ['en' => 'Industry, Manufacturing and Commerce', 'fr' => 'Industries, fabrication, et commerce'],
-                ['en' => 'Labour',                               'fr' => 'Travail'],
-                ['en' => 'Law and Justice',                      'fr' => 'Droit et justice'],
-                ['en' => 'Medicine and Health',                  'fr' => 'Médecine et santé'],
-                ['en' => 'Military',                             'fr' => 'Forces armées'],
-                ['en' => 'Natural Resources',                    'fr' => 'Richesses naturelles'],
-                ['en' => 'Politics and Government',              'fr' => 'Politique et gouvernement'],
-                ['en' => 'Populations',                          'fr' => 'Populations'],
-                ['en' => 'Recreation / Leisure / Sports',        'fr' => 'Loisirs et sports'],
-                ['en' => 'Religion',                             'fr' => 'Religion'],
-                ['en' => 'Science and Technology',               'fr' => 'Sciences et technologie'],
-                ['en' => 'Social Organizations and Activities',  'fr' => 'Vie sociale'],
-                ['en' => 'Transportation',                       'fr' => 'Transport'],
-                ['en' => 'Travel and Exploration',               'fr' => 'Voyages et exploration'],
-            ]
-            as $termNames
+                ['en' => 'Labour', 'fr' => 'Travail'],
+                ['en' => 'Law and Justice', 'fr' => 'Droit et justice'],
+                ['en' => 'Medicine and Health', 'fr' => 'Médecine et santé'],
+                ['en' => 'Military', 'fr' => 'Forces armées'],
+                ['en' => 'Natural Resources', 'fr' => 'Richesses naturelles'],
+                ['en' => 'Politics and Government', 'fr' => 'Politique et gouvernement'],
+                ['en' => 'Populations', 'fr' => 'Populations'],
+                ['en' => 'Recreation / Leisure / Sports', 'fr' => 'Loisirs et sports'],
+                ['en' => 'Religion', 'fr' => 'Religion'],
+                ['en' => 'Science and Technology', 'fr' => 'Sciences et technologie'],
+                ['en' => 'Social Organizations and Activities', 'fr' => 'Vie sociale'],
+                ['en' => 'Transportation', 'fr' => 'Transport'],
+                ['en' => 'Travel and Exploration', 'fr' => 'Voyages et exploration'],
+            ] as $termNames
         ) {
             $term = new QubitTerm();
             $term->parentId = QubitTerm::ROOT_ID;
diff --git a/lib/task/migrate/migrations/arMigration0110.class.php b/lib/task/migrate/migrations/arMigration0110.class.php
index a135417aa1..1bc68d7222 100644
--- a/lib/task/migrate/migrations/arMigration0110.class.php
+++ b/lib/task/migrate/migrations/arMigration0110.class.php
@@ -48,8 +48,7 @@ public function up($configuration)
                 ['en' => 'Alphanumeric designations'],
                 ['en' => 'Variant title information'],
                 ['en' => 'Processing information'],
-            ]
-            as $termNames
+            ] as $termNames
         ) {
             $term = new QubitTerm();
             $term->parentId = QubitTerm::ROOT_ID;
diff --git a/lib/task/migrate/migrations/arMigration0117.class.php b/lib/task/migrate/migrations/arMigration0117.class.php
index c8eb5bd6f8..206dc94690 100644
--- a/lib/task/migrate/migrations/arMigration0117.class.php
+++ b/lib/task/migrate/migrations/arMigration0117.class.php
@@ -97,8 +97,7 @@ public function up($configuration)
                 ['en' => 'Sheet Music'],
                 ['en' => 'Timetables'],
                 ['en' => 'Transcriptions'],
-            ]
-            as $termNames
+            ] as $termNames
         ) {
             $term = new QubitTerm();
             $term->parentId = QubitTerm::ROOT_ID;
diff --git a/lib/task/physicalobject/physicalObjectDeleteUnlinkedTask.class.php b/lib/task/physicalobject/physicalObjectDeleteUnlinkedTask.class.php
index 6078dcbff9..5cf3c2416e 100644
--- a/lib/task/physicalobject/physicalObjectDeleteUnlinkedTask.class.php
+++ b/lib/task/physicalobject/physicalObjectDeleteUnlinkedTask.class.php
@@ -49,7 +49,7 @@ public function execute($arguments = [], $options = [])
             if (!$confirmation) {
                 $this->log('Aborted.');
 
-                exit();
+                exit;
             }
         }
 
diff --git a/lib/task/physicalobject/physicalObjectNormalizeTask.class.php b/lib/task/physicalobject/physicalObjectNormalizeTask.class.php
index 3e81c710dc..e71ae84ead 100644
--- a/lib/task/physicalobject/physicalObjectNormalizeTask.class.php
+++ b/lib/task/physicalobject/physicalObjectNormalizeTask.class.php
@@ -52,7 +52,7 @@ public function execute($arguments = [], $options = [])
             if (!$confirmation) {
                 $this->log('Aborted.');
 
-                exit();
+                exit;
             }
         }
 
diff --git a/lib/task/tools/deleteDescriptionTask.class.php b/lib/task/tools/deleteDescriptionTask.class.php
index 3d6128e573..6fc38bb66c 100644
--- a/lib/task/tools/deleteDescriptionTask.class.php
+++ b/lib/task/tools/deleteDescriptionTask.class.php
@@ -89,7 +89,7 @@ protected function configure()
     /**
      * Allow the user to bail out if they aren't sure they want to delete targeted descriptions.
      *
-     * @param $noConfirmation  whether or not to bypass the confirmation warning (true = bypass)
+     * @param $noConfirmation whether or not to bypass the confirmation warning (true = bypass)
      *
      * @return bool true if we want to proceed with the task, false if we want to abort
      */
@@ -154,7 +154,7 @@ private function fetchResource($slug)
     /**
      * Delete specified description & its descendants from AtoM.
      *
-     * @param $root  a top level QubitInformationObject which will be deleted along with its descendants
+     * @param $root a top level QubitInformationObject which will be deleted along with its descendants
      */
     private function deleteDescriptions($root)
     {
diff --git a/lib/task/tools/sitemapTask.class.php b/lib/task/tools/sitemapTask.class.php
index d3f267aab6..b9e11f51fa 100644
--- a/lib/task/tools/sitemapTask.class.php
+++ b/lib/task/tools/sitemapTask.class.php
@@ -52,8 +52,7 @@ public function execute($arguments = [], $options = [])
             ->name('sitemap*.xml')
             ->name('sitemap*.xml.gz')
             ->maxdepth(0)
-            ->in($options['output-directory'])
-        ;
+            ->in($options['output-directory']);
         if (count($files) > 0) {
             if (!$options['no-confirmation']) {
                 $result = $this->askConfirmation(['Do you want to delete the previous sitemap(s)? (Y/n)'], 'QUESTION_LARGE', true);
diff --git a/plugins/arDominionB5Plugin/modules/accession/templates/_alternativeIdentifiers.php b/plugins/arDominionB5Plugin/modules/accession/templates/_alternativeIdentifiers.php
index 58e3d8cdfe..fffbd9c7ea 100644
--- a/plugins/arDominionB5Plugin/modules/accession/templates/_alternativeIdentifiers.php
+++ b/plugins/arDominionB5Plugin/modules/accession/templates/_alternativeIdentifiers.php
@@ -37,8 +37,10 @@ class="collapse<?php echo 0 < count($alternativeIdentifierData) ? ' show' : '';
         </tr>
       </thead>
       <tbody>
-        <?php $i = 0; foreach ($alternativeIdentifierData as $identifier) { ?>
-          <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]"); ++$i; ?>
+        <?php $i = 0;
+        foreach ($alternativeIdentifierData as $identifier) { ?>
+          <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]");
+          ++$i; ?>
 
           <tr class="related_obj_<?php echo $identifier['id']; ?>">
             <td>
diff --git a/plugins/arDominionB5Plugin/modules/accession/templates/_events.php b/plugins/arDominionB5Plugin/modules/accession/templates/_events.php
index 83622fde0d..59c920b671 100644
--- a/plugins/arDominionB5Plugin/modules/accession/templates/_events.php
+++ b/plugins/arDominionB5Plugin/modules/accession/templates/_events.php
@@ -24,8 +24,10 @@
       </tr>
     </thead>
     <tbody>
-      <?php $i = 0; foreach ($eventData as $event) { ?>
-        <?php $form->getWidgetSchema()->setNameFormat("events[{$i}][%s]"); ++$i; ?>
+      <?php $i = 0;
+      foreach ($eventData as $event) { ?>
+        <?php $form->getWidgetSchema()->setNameFormat("events[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="related_obj_<?php echo $event['id']; ?>">
           <td>
diff --git a/plugins/arDominionB5Plugin/modules/accession/templates/indexSuccess.php b/plugins/arDominionB5Plugin/modules/accession/templates/indexSuccess.php
index 7556887b40..e3bd080168 100644
--- a/plugins/arDominionB5Plugin/modules/accession/templates/indexSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/accession/templates/indexSuccess.php
@@ -217,7 +217,7 @@
 
 <?php slot('after-content'); ?>
   <ul class="actions mb-3 nav gap-2">
-    <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+    <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
       <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'accession', 'action' => 'edit'], ['class' => 'btn atom-btn-outline-light']); ?></li>
     <?php } ?>
 
@@ -237,7 +237,7 @@
         </button>
         <ul class="dropdown-menu mb-2">
           <li><?php echo link_to(__('Create %1%', ['%1%' => sfConfig::get('app_ui_label_informationobject')]), [$resource, 'module' => 'accession', 'action' => 'addInformationObject'], ['class' => 'dropdown-item']); ?></li>
-          <li><?php echo link_to(__('Create new rights'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit'], ['class' => 'dropdown-item']); ?></li>
+          <li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit'], ['class' => 'dropdown-item']); ?></li>
           <li><?php echo link_to(__('Link physical storage'), [$resource, 'module' => 'object', 'action' => 'editPhysicalObjects'], ['class' => 'dropdown-item']); ?></li>
         </ul>
       </div>
diff --git a/plugins/arDominionB5Plugin/modules/actor/templates/_actions.php b/plugins/arDominionB5Plugin/modules/actor/templates/_actions.php
index 60beff118b..5f4628e678 100644
--- a/plugins/arDominionB5Plugin/modules/actor/templates/_actions.php
+++ b/plugins/arDominionB5Plugin/modules/actor/templates/_actions.php
@@ -2,7 +2,7 @@
 
 <ul class="actions mb-3 nav gap-2">
 
-  <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+  <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
     <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'actor', 'action' => 'edit'], ['class' => 'btn atom-btn-outline-light']); ?></li>
   <?php } ?>
 
diff --git a/plugins/arDominionB5Plugin/modules/actor/templates/_occupations.php b/plugins/arDominionB5Plugin/modules/actor/templates/_occupations.php
index 1b7cf73156..4f49e4210a 100644
--- a/plugins/arDominionB5Plugin/modules/actor/templates/_occupations.php
+++ b/plugins/arDominionB5Plugin/modules/actor/templates/_occupations.php
@@ -36,8 +36,10 @@
                   .' #name">';
           }
       ?>
-      <?php $i = 0; foreach ($occupations as $item) { ?>
-        <?php $form->getWidgetSchema()->setNameFormat("occupations[{$i}][%s]"); ++$i; ?>
+      <?php $i = 0;
+      foreach ($occupations as $item) { ?>
+        <?php $form->getWidgetSchema()->setNameFormat("occupations[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="related_obj_<?php echo $item->id; ?>">
           <td>
diff --git a/plugins/arDominionB5Plugin/modules/deaccession/templates/indexSuccess.php b/plugins/arDominionB5Plugin/modules/deaccession/templates/indexSuccess.php
index 5b2a57de46..2eda3427c1 100644
--- a/plugins/arDominionB5Plugin/modules/deaccession/templates/indexSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/deaccession/templates/indexSuccess.php
@@ -52,7 +52,7 @@
 <?php slot('after-content'); ?>
   <?php if (QubitAcl::check($resource, ['delete', 'update', 'translate'])) { ?>
     <ul class="actions mb-3 nav gap-2">
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'deaccession', 'action' => 'edit'], ['class' => 'btn atom-btn-outline-light']); ?></li>
       <?php } ?>
       <?php if (QubitAcl::check($resource, 'delete')) { ?>
diff --git a/plugins/arDominionB5Plugin/modules/digitalobject/templates/_show.php b/plugins/arDominionB5Plugin/modules/digitalobject/templates/_show.php
index 6f3f1a4cb5..2acd48a623 100644
--- a/plugins/arDominionB5Plugin/modules/digitalobject/templates/_show.php
+++ b/plugins/arDominionB5Plugin/modules/digitalobject/templates/_show.php
@@ -17,8 +17,7 @@
 <?php } else { ?>
   <div class="digital-object-reference text-center<?php echo $editForm
       ? ''
-      : ' p-3 border-bottom'
-  ; ?>">
+      : ' p-3 border-bottom'; ?>">
     <?php if (!empty($accessWarning)) { ?>
       <div class="access-warning">
         <?php echo $accessWarning; ?>
diff --git a/plugins/arDominionB5Plugin/modules/informationobject/templates/_actions.php b/plugins/arDominionB5Plugin/modules/informationobject/templates/_actions.php
index 9c01a34cdb..1a661b6a18 100644
--- a/plugins/arDominionB5Plugin/modules/informationobject/templates/_actions.php
+++ b/plugins/arDominionB5Plugin/modules/informationobject/templates/_actions.php
@@ -2,7 +2,7 @@
   
   <ul class="actions mb-3 nav gap-2">
 
-    <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+    <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
       <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'informationobject', 'action' => 'edit'], ['class' => 'btn atom-btn-outline-light']); ?></li>
     <?php } ?>
 
@@ -62,9 +62,9 @@
 
             <li><hr class="dropdown-divider"></li>
 
-            <li><?php echo link_to(__('Create new rights'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit'], ['class' => 'dropdown-item']); ?></li>
+            <li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit'], ['class' => 'dropdown-item']); ?></li>
             <?php if ($resource->hasChildren()) { ?>
-              <li><?php echo link_to(__('Manage rights inheritance'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage'], ['class' => 'dropdown-item']); ?></li>
+              <li><?php echo link_to(__('Manage rights inheritance'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'manage'], ['class' => 'dropdown-item']); ?></li>
             <?php } ?>
 
             <?php if (sfConfig::get('app_audit_log_enabled', false)) { ?>
diff --git a/plugins/arDominionB5Plugin/modules/informationobject/templates/_identifierOptions.php b/plugins/arDominionB5Plugin/modules/informationobject/templates/_identifierOptions.php
index 926c44465e..7ce17a8427 100644
--- a/plugins/arDominionB5Plugin/modules/informationobject/templates/_identifierOptions.php
+++ b/plugins/arDominionB5Plugin/modules/informationobject/templates/_identifierOptions.php
@@ -59,8 +59,10 @@ class="collapse<?php echo 0 < count($alternativeIdentifiers) ? ' show' : ''; ?>"
           </tr>
         </thead>
         <tbody>
-          <?php $i = 0; foreach ($alternativeIdentifiers as $item) { ?>
-            <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]"); ++$i; ?>
+          <?php $i = 0;
+          foreach ($alternativeIdentifiers as $item) { ?>
+            <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]");
+            ++$i; ?>
 
             <tr class="related_obj_<?php echo $item->id; ?>">
               <td>
diff --git a/plugins/arDominionB5Plugin/modules/menu/templates/listSuccess.php b/plugins/arDominionB5Plugin/modules/menu/templates/listSuccess.php
index f9f49c1a00..c88391f0bb 100644
--- a/plugins/arDominionB5Plugin/modules/menu/templates/listSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/menu/templates/listSuccess.php
@@ -28,7 +28,7 @@
 	  <tr>
             <td<?php if (QubitMenu::ROOT_ID == $item['parentId']) { ?> class="fw-bold"<?php } ?>>
 
-              <?php echo str_repeat('&nbsp;&nbsp;', ($item['depth'] - 1)); ?>
+              <?php echo str_repeat('&nbsp;&nbsp;', $item['depth'] - 1); ?>
 
               <?php if (isset($item['prev'])) { ?>
                 <?php echo link_to(image_tag('up.gif', ['alt' => __('Move up')]), ['module' => 'menu', 'action' => 'list', 'move' => $item['id'], 'before' => $item['prev']], ['title' => __('Move item up in list')]); ?>
diff --git a/plugins/arDominionB5Plugin/modules/object/templates/_notes.php b/plugins/arDominionB5Plugin/modules/object/templates/_notes.php
index 288af01d94..c79b07f999 100644
--- a/plugins/arDominionB5Plugin/modules/object/templates/_notes.php
+++ b/plugins/arDominionB5Plugin/modules/object/templates/_notes.php
@@ -24,8 +24,10 @@
       </tr>
     </thead>
     <tbody>
-      <?php $i = 0; foreach ($notes as $item) { ?>
-        <?php $form->getWidgetSchema()->setNameFormat($arrayName."[{$i}][%s]"); ++$i; ?>
+      <?php $i = 0;
+      foreach ($notes as $item) { ?>
+        <?php $form->getWidgetSchema()->setNameFormat($arrayName."[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="related_obj_<?php echo $item->id; ?>">
           <td>
diff --git a/plugins/arDominionB5Plugin/modules/right/templates/editSuccess.php b/plugins/arDominionB5Plugin/modules/right/templates/editSuccess.php
index dd0186e068..cc4890484c 100644
--- a/plugins/arDominionB5Plugin/modules/right/templates/editSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/right/templates/editSuccess.php
@@ -200,8 +200,7 @@ class="accordion-collapse collapse"
                   <button
                     class="btn atom-btn-white active-primary text-wrap<?php echo 0 == $i
                         ? ' active'
-                        : ''
-                    ; ?>"
+                        : ''; ?>"
                     id="act-rights-<?php echo $i; ?>"
                     data-bs-toggle="pill"
                     data-bs-target="#act-rights-content-<?php echo $i; ?>"
diff --git a/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcDates.php b/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcDates.php
index f613a214ce..427f0dd498 100644
--- a/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcDates.php
+++ b/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcDates.php
@@ -21,8 +21,10 @@
       </tr>
     </thead>
     <tbody>
-      <?php $i = 0; foreach ($resource->getDates() as $item) { ?>
-        <?php $form->getWidgetSchema()->setNameFormat("editDates[{$i}][%s]"); ++$i; ?>
+      <?php $i = 0;
+      foreach ($resource->getDates() as $item) { ?>
+        <?php $form->getWidgetSchema()->setNameFormat("editDates[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="date related_obj_<?php echo $item->id; ?>">
           <td>
diff --git a/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcNames.php b/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcNames.php
index 8365d5146d..ee910dac17 100644
--- a/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcNames.php
+++ b/plugins/arDominionB5Plugin/modules/sfDcPlugin/templates/_dcNames.php
@@ -18,9 +18,11 @@
       </tr>
     </thead>
     <tbody>
-      <?php $i = 0; foreach ($resource->getActorEvents() as $item) { ?>
+      <?php $i = 0;
+      foreach ($resource->getActorEvents() as $item) { ?>
         <?php if (isset($item->actor)) { ?>
-          <?php $form->getWidgetSchema()->setNameFormat("editNames[{$i}][%s]"); ++$i; ?>
+          <?php $form->getWidgetSchema()->setNameFormat("editNames[{$i}][%s]");
+          ++$i; ?>
 
           <tr class="related_obj_<?php echo $item->id; ?>">
             <td>
diff --git a/plugins/arDominionB5Plugin/modules/sfIsadPlugin/templates/_event.php b/plugins/arDominionB5Plugin/modules/sfIsadPlugin/templates/_event.php
index 15eebb5b77..86f2094ece 100644
--- a/plugins/arDominionB5Plugin/modules/sfIsadPlugin/templates/_event.php
+++ b/plugins/arDominionB5Plugin/modules/sfIsadPlugin/templates/_event.php
@@ -25,8 +25,10 @@
       </tr>
     </thead>
     <tbody>
-      <?php $i = 0; foreach ($resource->getDates() as $item) { ?>
-        <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]"); ++$i; ?>
+      <?php $i = 0;
+      foreach ($resource->getDates() as $item) { ?>
+        <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="date related_obj_<?php echo $item->id; ?>">
           <td>
diff --git a/plugins/arDominionB5Plugin/modules/sfIsdfPlugin/templates/indexSuccess.php b/plugins/arDominionB5Plugin/modules/sfIsdfPlugin/templates/indexSuccess.php
index edd859cffc..94ca632913 100644
--- a/plugins/arDominionB5Plugin/modules/sfIsdfPlugin/templates/indexSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/sfIsdfPlugin/templates/indexSuccess.php
@@ -135,7 +135,8 @@
 
         <?php echo render_show(__('Title'), link_to(render_title($item->object->getTitle(['cultureFallback' => true])), [$item->object, 'module' => 'informationobject']), ['isSubField' => true]); ?>
 
-        <?php $isad = new sfIsadPlugin($item->object); echo render_show(__('Identifier'), render_value_inline($isad->referenceCode), ['isSubField' => true]); ?>
+        <?php $isad = new sfIsadPlugin($item->object);
+        echo render_show(__('Identifier'), render_value_inline($isad->referenceCode), ['isSubField' => true]); ?>
 
         <?php if (null !== $item->description) { ?>
           <?php echo render_show(__('Nature of relationship'), render_value($item->description), ['isSubField' => true]); ?>
diff --git a/plugins/arDominionB5Plugin/modules/sfIsdiahPlugin/templates/indexSuccess.php b/plugins/arDominionB5Plugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
index 4c61978c66..61af4dd234 100644
--- a/plugins/arDominionB5Plugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
+++ b/plugins/arDominionB5Plugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
@@ -269,7 +269,7 @@
   <?php slot('after-content'); ?>
 
     <ul class="actions mb-3 nav gap-2">
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'repository', 'action' => 'edit'], ['class' => 'btn atom-btn-outline-light']); ?></li>
       <?php } ?>
       <?php if (QubitAcl::check($resource, 'delete')) { ?>
@@ -281,7 +281,7 @@
       <?php if (QubitAcl::check(QubitInformationObject, 'create')) { ?>
         <li><?php echo link_to(__('Add description'), ['module' => 'informationobject', 'action' => 'add', 'repository' => $resource->id], ['class' => 'btn atom-btn-outline-light']); ?></li>
       <?php } ?>
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit theme'), [$resource, 'module' => 'repository', 'action' => 'editTheme'], ['class' => 'btn atom-btn-outline-light']); ?></li>
       <?php } ?>
     </ul>
diff --git a/plugins/arRestApiPlugin/modules/api/actions/informationobjectsBrowseAction.class.php b/plugins/arRestApiPlugin/modules/api/actions/informationobjectsBrowseAction.class.php
index e74d11cb49..0861621527 100644
--- a/plugins/arRestApiPlugin/modules/api/actions/informationobjectsBrowseAction.class.php
+++ b/plugins/arRestApiPlugin/modules/api/actions/informationobjectsBrowseAction.class.php
@@ -70,6 +70,7 @@ protected function get($request)
                 $order = 'asc';
 
                 break;
+
             // I don't think that this is going to scale, but let's leave it for now
             case 'alphabetic':
                 $field = sprintf('i18n.%s.title.alphasort', sfContext::getInstance()->user->getCulture());
diff --git a/plugins/qbAclPlugin/lib/QubitAcl.class.php b/plugins/qbAclPlugin/lib/QubitAcl.class.php
index 989cbe4bd3..82115a177e 100644
--- a/plugins/qbAclPlugin/lib/QubitAcl.class.php
+++ b/plugins/qbAclPlugin/lib/QubitAcl.class.php
@@ -188,7 +188,7 @@ public static function isAllowed($role, $resource, $action, $options = [])
      * Add permissions to repository access array.
      *
      * @param $repositoryAccess input access array
-     * @param $permissions QubitQuery permission list
+     * @param $permissions      QubitQuery permission list
      *
      * @return array output access array
      */
@@ -230,7 +230,7 @@ public static function addRepositoryAccess($repositoryAccess, $permissions)
     /**
      * List the repository access rules for the current user.
      *
-     * @param $action integer Access privilige being requested
+     * @param $action  integer Access privilige being requested
      * @param $options array optional parameters
      *
      * @return array
@@ -775,6 +775,7 @@ private static function checkAccessByClass($resource, $user, $action, $options)
                             || $user->hasGroup(QubitAclGroup::EDITOR_ID));
 
                 break;
+
             // Administrator only
             case 'QubitUser':
             case 'QubitMenu':
@@ -784,6 +785,7 @@ private static function checkAccessByClass($resource, $user, $action, $options)
                 $hasAccess = $user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID);
 
                 break;
+
             // Class specific ACL rules
             case 'QubitActor':
                 $hasAccess = QubitActorAcl::isAllowed(
@@ -804,6 +806,7 @@ private static function checkAccessByClass($resource, $user, $action, $options)
                 );
 
                 break;
+
             // Rely on ACL for authorization
             // TODO Switch *all* authorization to ACL
             default:
diff --git a/plugins/qbAclPlugin/lib/QubitAclConditionalAssert.class.php b/plugins/qbAclPlugin/lib/QubitAclConditionalAssert.class.php
index 306e49b869..54b5db1837 100644
--- a/plugins/qbAclPlugin/lib/QubitAclConditionalAssert.class.php
+++ b/plugins/qbAclPlugin/lib/QubitAclConditionalAssert.class.php
@@ -31,8 +31,8 @@ public function __construct($permission)
 
     public function assert(
         Zend_Acl $acl,
-        Zend_Acl_Role_Interface $role = null,
-        Zend_Acl_Resource_Interface $resource = null,
+        ?Zend_Acl_Role_Interface $role = null,
+        ?Zend_Acl_Resource_Interface $resource = null,
         $privilege = null
     ) {
         // Translate permissions are global to all objects
diff --git a/plugins/qbAclPlugin/lib/model/QubitAclGroupI18n.php b/plugins/qbAclPlugin/lib/model/QubitAclGroupI18n.php
index 18a35cfec2..f272930ee1 100644
--- a/plugins/qbAclPlugin/lib/model/QubitAclGroupI18n.php
+++ b/plugins/qbAclPlugin/lib/model/QubitAclGroupI18n.php
@@ -22,6 +22,4 @@
  *
  * @see plugins/qbAclPlugin/lib/model/om/BaseAclGroupI18n.php
  */
-class QubitAclGroupI18n extends BaseAclGroupI18n
-{
-}
+class QubitAclGroupI18n extends BaseAclGroupI18n {}
diff --git a/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php b/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
index 534258e33a..0e50d5b515 100644
--- a/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
+++ b/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
@@ -19,7 +19,5 @@
 
 class AclGroupProtectedAction extends sfAction
 {
-    public function execute($request)
-    {
-    }
+    public function execute($request) {}
 }
diff --git a/plugins/qtAccessionPlugin/lib/model/QubitAccessionEventI18n.php b/plugins/qtAccessionPlugin/lib/model/QubitAccessionEventI18n.php
index a6dba28009..3aefa97fc0 100644
--- a/plugins/qtAccessionPlugin/lib/model/QubitAccessionEventI18n.php
+++ b/plugins/qtAccessionPlugin/lib/model/QubitAccessionEventI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitAccessionEventI18n extends BaseAccessionEventI18n
-{
-} // QubitAccessionEventI18n
+class QubitAccessionEventI18n extends BaseAccessionEventI18n {} // QubitAccessionEventI18n
diff --git a/plugins/qtAccessionPlugin/lib/model/QubitAccessionI18n.php b/plugins/qtAccessionPlugin/lib/model/QubitAccessionI18n.php
index dbf7c40c64..478861cc97 100644
--- a/plugins/qtAccessionPlugin/lib/model/QubitAccessionI18n.php
+++ b/plugins/qtAccessionPlugin/lib/model/QubitAccessionI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitAccessionI18n extends BaseAccessionI18n
-{
-}
+class QubitAccessionI18n extends BaseAccessionI18n {}
diff --git a/plugins/qtAccessionPlugin/lib/model/QubitDeaccessionI18n.php b/plugins/qtAccessionPlugin/lib/model/QubitDeaccessionI18n.php
index db4f0cf878..3dda6187d0 100644
--- a/plugins/qtAccessionPlugin/lib/model/QubitDeaccessionI18n.php
+++ b/plugins/qtAccessionPlugin/lib/model/QubitDeaccessionI18n.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitDeaccessionI18n extends BaseDeaccessionI18n
-{
-}
+class QubitDeaccessionI18n extends BaseDeaccessionI18n {}
diff --git a/plugins/qtAccessionPlugin/lib/model/QubitDonor.php b/plugins/qtAccessionPlugin/lib/model/QubitDonor.php
index 070a2eddc1..aae527768e 100644
--- a/plugins/qtAccessionPlugin/lib/model/QubitDonor.php
+++ b/plugins/qtAccessionPlugin/lib/model/QubitDonor.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class QubitDonor extends BaseDonor
-{
-}
+class QubitDonor extends BaseDonor {}
diff --git a/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorAction.class.php b/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorAction.class.php
index 743c27c26e..169a13c14b 100644
--- a/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorAction.class.php
+++ b/plugins/qtAccessionPlugin/modules/accession/actions/relatedDonorAction.class.php
@@ -38,8 +38,7 @@ public function extraQueries($value)
                     'latitude',
                     'longitude',
                     'note',
-                ]
-                as $field
+                ] as $field
             ) {
                 if (isset($contact->{$field})) {
                     $value[$field] = $contact->{$field};
diff --git a/plugins/qtAccessionPlugin/modules/accession/templates/_alternativeIdentifiers.php b/plugins/qtAccessionPlugin/modules/accession/templates/_alternativeIdentifiers.php
index 45a46b3782..973d5c4d6d 100644
--- a/plugins/qtAccessionPlugin/modules/accession/templates/_alternativeIdentifiers.php
+++ b/plugins/qtAccessionPlugin/modules/accession/templates/_alternativeIdentifiers.php
@@ -13,7 +13,8 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($alternativeIdentifierData as $identifier) { ?>
+      <?php $i = 0;
+      foreach ($alternativeIdentifierData as $identifier) { ?>
         <?php $form->getWidgetSchema()->setNameFormat("alternativeIdentifiers[{$i}][%s]"); ?>
 
         <tr class="<?php echo 0 == $i % 2 ? 'even' : 'odd'; ?> related_obj_<?php echo $identifier['id']; ?>">
diff --git a/plugins/qtAccessionPlugin/modules/accession/templates/_events.php b/plugins/qtAccessionPlugin/modules/accession/templates/_events.php
index 68a6d10cc2..9e4db65275 100644
--- a/plugins/qtAccessionPlugin/modules/accession/templates/_events.php
+++ b/plugins/qtAccessionPlugin/modules/accession/templates/_events.php
@@ -15,7 +15,8 @@
       </tr>
     </thead><tbody>
 
-    <?php $i = 0; foreach ($eventData as $event) { ?>
+    <?php $i = 0;
+    foreach ($eventData as $event) { ?>
       <?php $form->getWidgetSchema()->setNameFormat("events[{$i}][%s]"); ?>
 
       <tr class="<?php echo 0 == $i % 2 ? 'even' : 'odd'; ?> related_obj_<?php echo $event['id']; ?>">
diff --git a/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php b/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
index 8d6cd5ff79..8449f30ece 100644
--- a/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
+++ b/plugins/qtAccessionPlugin/modules/accession/templates/indexSuccess.php
@@ -199,7 +199,7 @@
   <section class="actions">
     <ul>
 
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'accession', 'action' => 'edit'], ['class' => 'c-btn']); ?></li>
       <?php } ?>
 
@@ -221,7 +221,7 @@
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu">
-            <li><?php echo link_to(__('Create new rights'), [$resource,  'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
+            <li><?php echo link_to(__('Create new rights'), [$resource, 'sf_route' => 'slug/default', 'module' => 'right', 'action' => 'edit']); ?></li>
             <li><?php echo link_to(__('Link physical storage'), [$resource, 'module' => 'object', 'action' => 'editPhysicalObjects']); ?></li>
           </ul>
         </div>
diff --git a/plugins/qtAccessionPlugin/modules/deaccession/templates/indexSuccess.php b/plugins/qtAccessionPlugin/modules/deaccession/templates/indexSuccess.php
index 5b5f4a6140..585df2edd6 100644
--- a/plugins/qtAccessionPlugin/modules/deaccession/templates/indexSuccess.php
+++ b/plugins/qtAccessionPlugin/modules/deaccession/templates/indexSuccess.php
@@ -45,7 +45,7 @@
 <?php slot('after-content'); ?>
   <section class="actions">
     <ul>
-      <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+      <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
         <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'deaccession', 'action' => 'edit'], ['class' => 'c-btn']); ?></li>
       <?php } ?>
       <?php if (QubitAcl::check($resource, 'delete')) { ?>
diff --git a/plugins/qtAccessionPlugin/modules/donor/actions/primaryContactAction.class.php b/plugins/qtAccessionPlugin/modules/donor/actions/primaryContactAction.class.php
index b2d1e46c14..8e67da97eb 100644
--- a/plugins/qtAccessionPlugin/modules/donor/actions/primaryContactAction.class.php
+++ b/plugins/qtAccessionPlugin/modules/donor/actions/primaryContactAction.class.php
@@ -51,8 +51,7 @@ public function execute($request)
                 'latitude',
                 'longitude',
                 'note',
-            ]
-            as $field
+            ] as $field
         ) {
             if (isset($primaryContactInformation->{$field})) {
                 $data[$field] = $primaryContactInformation->{$field};
diff --git a/plugins/qtSwordPlugin/lib/qtPackageExtractorBase.class.php b/plugins/qtSwordPlugin/lib/qtPackageExtractorBase.class.php
index 06724d56eb..2f64404eaf 100644
--- a/plugins/qtSwordPlugin/lib/qtPackageExtractorBase.class.php
+++ b/plugins/qtSwordPlugin/lib/qtPackageExtractorBase.class.php
@@ -141,9 +141,7 @@ protected function load()
     }
 
     // This method will be frequently extended from the derived class
-    protected function process()
-    {
-    }
+    protected function process() {}
 
     protected function grab()
     {
@@ -162,6 +160,7 @@ protected function grab()
                     $this->filename = sfConfig::get('app_sword_deposit_dir', '/tmp').DIRECTORY_SEPARATOR.$name;
 
                     break;
+
                 // Other locations that we could support in the future
                 case 'http':
                 case 'https':
diff --git a/plugins/qtSwordPlugin/lib/qtPackageExtractorChecksumException.class.php b/plugins/qtSwordPlugin/lib/qtPackageExtractorChecksumException.class.php
index 4a1967b4d3..b1cd412efd 100644
--- a/plugins/qtSwordPlugin/lib/qtPackageExtractorChecksumException.class.php
+++ b/plugins/qtSwordPlugin/lib/qtPackageExtractorChecksumException.class.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class qtPackageExtractorChecksumException extends Exception
-{
-}
+class qtPackageExtractorChecksumException extends Exception {}
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorBadRequestSuccess.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorBadRequestSuccess.xml.php
index f0e075b45a..c247f1fb02 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorBadRequestSuccess.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorBadRequestSuccess.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorChecksumMismatchSuccess.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorChecksumMismatchSuccess.xml.php
index 7091c03184..415d0a826f 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorChecksumMismatchSuccess.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorChecksumMismatchSuccess.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorContentSuccess.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorContentSuccess.xml.php
index 2d708df508..39cc911fd9 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorContentSuccess.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorContentSuccess.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorMaxUploadSizeExceeded.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorMaxUploadSizeExceeded.xml.php
index a85eda0d88..8404a928fb 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorMaxUploadSizeExceeded.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorMaxUploadSizeExceeded.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorNotImplementedSuccess.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorNotImplementedSuccess.xml.php
index fe99a96588..09803ad24e 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorNotImplementedSuccess.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/ErrorNotImplementedSuccess.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/MediationNotAllowedSuccess.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/MediationNotAllowedSuccess.xml.php
index af5aa45911..f4c2b53199 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/MediationNotAllowedSuccess.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/MediationNotAllowedSuccess.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/TargetOwnerUnknown.xml.php b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/TargetOwnerUnknown.xml.php
index 4e47b80388..7be0828967 100644
--- a/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/TargetOwnerUnknown.xml.php
+++ b/plugins/qtSwordPlugin/modules/qtSwordPlugin/templates/error/TargetOwnerUnknown.xml.php
@@ -9,7 +9,8 @@
 
   <title type="text">ERROR</title>
 
-  <updated><?php $dt = new DateTime(); echo $dt->format('c'); ?></updated>
+  <updated><?php $dt = new DateTime();
+  echo $dt->format('c'); ?></updated>
 
   <generator uri="<?php echo url_for('@homepage', true); ?>" version="<?php echo qubitConfiguration::VERSION; ?>">Qubit <?php echo qubitConfiguration::VERSION; ?></generator>
 
diff --git a/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcDates.php b/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcDates.php
index 9ba288f5b0..999835f16a 100644
--- a/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcDates.php
+++ b/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcDates.php
@@ -17,7 +17,8 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($resource->getDates() as $item) { ?>
+      <?php $i = 0;
+      foreach ($resource->getDates() as $item) { ?>
 
         <?php $form->getWidgetSchema()->setNameFormat("editDates[{$i}][%s]"); ?>
 
diff --git a/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcNames.php b/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcNames.php
index 0333162eee..c382d3a46a 100644
--- a/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcNames.php
+++ b/plugins/sfDcPlugin/modules/sfDcPlugin/templates/_dcNames.php
@@ -13,7 +13,8 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($resource->getActorEvents() as $item) { ?>
+      <?php $i = 0;
+      foreach ($resource->getActorEvents() as $item) { ?>
 
         <?php if (isset($item->actor)) { ?>
 
diff --git a/plugins/sfEacPlugin/lib/sfEacPlugin.class.php b/plugins/sfEacPlugin/lib/sfEacPlugin.class.php
index ecaac9f413..49b8f63654 100644
--- a/plugins/sfEacPlugin/lib/sfEacPlugin.class.php
+++ b/plugins/sfEacPlugin/lib/sfEacPlugin.class.php
@@ -484,7 +484,7 @@ public function parse($doc)
             throw new sfException($error);
         }
 
-        //$fd->find('eac:control/eac:otherRecordId');
+        // $fd->find('eac:control/eac:otherRecordId');
 
         $this->maintenanceStatus = $fd->find('eac:control/eac:maintenanceStatus')->text();
 
@@ -514,7 +514,7 @@ public function parse($doc)
         $this->resource->rules = $fd->find('eac:control/eac:conventionDeclaration/eac:citation')->text();
 
         // TODO <abbreviation/>, <descriptiveNote/>
-        //$fd->find('eac:control/eac:localTypeDeclaration');
+        // $fd->find('eac:control/eac:localTypeDeclaration');
 
         // TODO <date/>, <dateRange/>, <term/>
         $this->descriptionDetail = $fd->find('eac:control/eac:localControl[@localType="detailLevel"]/eac:term')->text();
@@ -561,9 +561,9 @@ public function parse($doc)
 
             $this->resource->otherNames[] = $item;
         }
-        //$fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:authorizedForm');
-        //$fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:alternativeForm');
-        //$fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:preferredForm');
+        // $fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:authorizedForm');
+        // $fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:alternativeForm');
+        // $fd->find('eac:cpfDescription/eac:identity/eac:nameEntry/eac:preferredForm');
 
         // TODO eac:cpfDescription/eac:identity/eac:descriptiveNote
 
@@ -576,14 +576,14 @@ public function parse($doc)
 
         // TODO <date/>, <dateRange/>, <dateSet/>, <descriptiveNote/>,
         // <placeEntry/>, <term/>
-        //$fd->find('eac:cpfDescription/eac:description/eac:localDescription');
-        //$fd->find('eac:cpfDescription/eac:description/eac:localDescriptions');
+        // $fd->find('eac:cpfDescription/eac:description/eac:localDescription');
+        // $fd->find('eac:cpfDescription/eac:description/eac:localDescriptions');
 
         // TODO <date/>, <dateRange/>, <dateSet/>, <descriptiveNote/>,
         // <placeEntry/>
         $this->resource->legalStatus = $fd->find('eac:cpfDescription/eac:description/eac:legalStatus/eac:term|eac:cpfDescription/eac:description/eac:legalStatuses/eac:legalStatus/eac:term')->text();
 
-        //$fd->find('eac:cpfDescription/eac:description/eac:languageUsed');
+        // $fd->find('eac:cpfDescription/eac:description/eac:languageUsed');
 
         // TODO <date/>, <dateRange/>, <dateSet/>, <descriptiveNote/>,
         // <placeEntry/>
@@ -984,7 +984,7 @@ public static function renderDates($item)
      * It was either this or a massive conditional statement like:
      * (isset($a) && $a) || (isset($b) && $b) || ...).
      *
-     * @param $resource  The actor we're getting information from
+     * @param $resource The actor we're getting information from
      *
      * @return bool True if there are one or more description elements, false otherwise
      */
@@ -1012,8 +1012,7 @@ protected static function fromDiscursiveSet($value)
             ->find('eac:list/eac:item')
             ->replaceWith(function ($node) {
                 return '* '.$node->textContent;
-            })
-        ;
+            });
 
         return $value->text();
     }
diff --git a/plugins/sfEacPlugin/modules/sfEacPlugin/actions/indexAction.class.php b/plugins/sfEacPlugin/modules/sfEacPlugin/actions/indexAction.class.php
index 0a88c6c2d1..15a786a99f 100644
--- a/plugins/sfEacPlugin/modules/sfEacPlugin/actions/indexAction.class.php
+++ b/plugins/sfEacPlugin/modules/sfEacPlugin/actions/indexAction.class.php
@@ -31,8 +31,7 @@ public function responseFilterContent(sfEvent $event, $content)
         return FluentDOM($content)
             ->namespaces(['eac' => 'urn:isbn:1-931666-33-4'])
             ->find('//eac:languageDeclaration[not(*)]')
-            ->remove()
-        ;
+            ->remove();
     }
 
     public function execute($request)
diff --git a/plugins/sfIsaarPlugin/lib/qtIsaarCsv.class.php b/plugins/sfIsaarPlugin/lib/qtIsaarCsv.class.php
index 28723b2cab..7e4ea05cc2 100644
--- a/plugins/sfIsaarPlugin/lib/qtIsaarCsv.class.php
+++ b/plugins/sfIsaarPlugin/lib/qtIsaarCsv.class.php
@@ -42,13 +42,13 @@ class qtIsaarCsv extends sfIsaarPlugin
         'legalStatus',
         'maintenanceNotes',
         'mandates',
-        //'otherNames',
-        //'parallelNames',
+        // 'otherNames',
+        // 'parallelNames',
         'places',
         'rules',
         'scripts',
         'sources',
-        //'standardizedNames'
+        // 'standardizedNames'
         'uniqueId',
     ];
     protected $resource;
diff --git a/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php b/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
index e09dd1552d..e46ec5d3c2 100644
--- a/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
+++ b/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/_event.php
@@ -19,15 +19,20 @@
       </tr>
     </thead><tbody>
 
-      <?php $i = 0; foreach ($resource->getDates() as $item) { ?>
+      <?php $i = 0;
+      foreach ($resource->getDates() as $item) { ?>
 
-        <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]"); ++$i; ?>
+        <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]");
+        ++$i; ?>
 
         <tr class="date <?php echo 0 == ++$i % 2 ? 'even' : 'odd'; ?> related_obj_<?php echo $item->id; ?>">
           <td>
             <div class="animateNicely">
               <input name="<?php echo $form->getWidgetSchema()->generateName('id'); ?>" type="hidden" value="<?php echo url_for([$item, 'module' => 'event']); ?>"/>
-              <?php $save = $form->type->choices; $form->type->choices += [url_for([$item->type, 'module' => 'term']) => $item->type]; echo $form->getWidgetSchema()->renderField('type', url_for([$item->type, 'module' => 'term'])); $form->type->choices = $save; ?>
+              <?php $save = $form->type->choices;
+              $form->type->choices += [url_for([$item->type, 'module' => 'term']) => $item->type];
+              echo $form->getWidgetSchema()->renderField('type', url_for([$item->type, 'module' => 'term']));
+              $form->type->choices = $save; ?>
             </div>
           </td><td>
             <div class="animateNicely">
@@ -46,7 +51,8 @@
 
       <?php } ?>
 
-      <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]"); ++$i; ?>
+      <?php $form->getWidgetSchema()->setNameFormat("editEvents[{$i}][%s]");
+      ++$i; ?>
 
       <tr class="date <?php echo 0 == ++$i % 2 ? 'even' : 'odd'; ?>">
         <td>
diff --git a/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/fileListSuccess.php b/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/fileListSuccess.php
index 2885bdf5cb..9ae5c68159 100644
--- a/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/fileListSuccess.php
+++ b/plugins/sfIsadPlugin/modules/sfIsadPlugin/templates/fileListSuccess.php
@@ -19,7 +19,8 @@
     <?php foreach ($informationObjects as $item) { ?>
       <tr class="<?php echo 0 == @++$row % 2 ? 'even' : 'odd'; ?>">
         <td>
-          <?php $isad = new sfIsadPlugin($item); echo render_value_inline($isad->referenceCode); ?>
+          <?php $isad = new sfIsadPlugin($item);
+          echo render_value_inline($isad->referenceCode); ?>
         </td><td>
           <?php echo link_to(render_title($item), [$item, 'module' => 'informationobject']); ?>
         </td><td>
diff --git a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
index add940fb7a..d085bab017 100644
--- a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
+++ b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/indexSuccess.php
@@ -132,7 +132,8 @@
 
         <?php echo render_show(__('Title'), link_to(render_title($item->object->getTitle(['cultureFallback' => true])), [$item->object, 'module' => 'informationobject'])); ?>
 
-        <?php $isad = new sfIsadPlugin($item->object); echo render_show(__('Identifier'), render_value($isad->referenceCode)); ?>
+        <?php $isad = new sfIsadPlugin($item->object);
+        echo render_show(__('Identifier'), render_value($isad->referenceCode)); ?>
 
         <?php if (null !== $item->description) { ?>
           <?php echo render_show(__('Nature of relationship'), render_value($item->description)); ?>
diff --git a/plugins/sfIsdiahPlugin/lib/sfIsdiahPlugin.class.php b/plugins/sfIsdiahPlugin/lib/sfIsdiahPlugin.class.php
index 6c5cf5a7db..423f68541f 100644
--- a/plugins/sfIsdiahPlugin/lib/sfIsdiahPlugin.class.php
+++ b/plugins/sfIsdiahPlugin/lib/sfIsdiahPlugin.class.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class sfIsdiahPlugin extends sfIsaarPlugin
-{
-}
+class sfIsdiahPlugin extends sfIsaarPlugin {}
diff --git a/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php b/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
index 5c85c27267..ea2f8c75fe 100644
--- a/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
+++ b/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
@@ -247,7 +247,7 @@
 
     <section class="actions">
       <ul>
-        <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+        <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
           <li><?php echo link_to(__('Edit'), [$resource, 'module' => 'repository', 'action' => 'edit'], ['class' => 'c-btn', 'title' => __('Edit')]); ?></li>
         <?php } ?>
         <?php if (QubitAcl::check($resource, 'delete')) { ?>
@@ -260,7 +260,7 @@
           <li><?php echo link_to(__('Add description'), ['module' => 'informationobject', 'action' => 'add', 'repository' => $resource->id], ['class' => 'c-btn', 'title' => __('Add description')]); ?></li>
         <?php } ?>
         <li class="divider"></li>
-        <?php if (QubitAcl::check($resource, 'update') || (QubitAcl::check($resource, 'translate'))) { ?>
+        <?php if (QubitAcl::check($resource, 'update') || QubitAcl::check($resource, 'translate')) { ?>
           <li><?php echo link_to(__('Edit theme'), [$resource, 'module' => 'repository', 'action' => 'editTheme'], ['class' => 'c-btn', 'title' => 'Edit theme']); ?></li>
         <?php } ?>
       </ul>
diff --git a/plugins/sfSkosPlugin/lib/sfSkosPluginException.class.php b/plugins/sfSkosPlugin/lib/sfSkosPluginException.class.php
index 83e8cc2dca..9486df7154 100644
--- a/plugins/sfSkosPlugin/lib/sfSkosPluginException.class.php
+++ b/plugins/sfSkosPlugin/lib/sfSkosPluginException.class.php
@@ -17,6 +17,4 @@
  * along with Access to Memory (AtoM).  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class sfSkosPluginException extends Exception
-{
-}
+class sfSkosPluginException extends Exception {}
diff --git a/plugins/sfSkosPlugin/test/unit/importTest.php b/plugins/sfSkosPlugin/test/unit/importTest.php
index d99a97886d..5f53660911 100644
--- a/plugins/sfSkosPlugin/test/unit/importTest.php
+++ b/plugins/sfSkosPlugin/test/unit/importTest.php
@@ -1024,5 +1024,5 @@ function getPrivateMethod($object, $name)
 
     $result = $methodGetRootConcepts->invoke($importer);
 
-    $t->is(count($result), $totalConcepts, "Number of concepts found in ${item[name]} equals to {$totalConcepts}");
+    $t->is(count($result), $totalConcepts, "Number of concepts found in {$item[name]} equals to {$totalConcepts}");
 }
diff --git a/plugins/sfThumbnailPlugin/lib/sfThumbnail.class.php b/plugins/sfThumbnailPlugin/lib/sfThumbnail.class.php
index 20be0f9adf..0ab5fd1e44 100644
--- a/plugins/sfThumbnailPlugin/lib/sfThumbnail.class.php
+++ b/plugins/sfThumbnailPlugin/lib/sfThumbnail.class.php
@@ -74,9 +74,9 @@ public function __destruct()
      * @param string filename (with absolute path) of the image to load. If the filename is a http(s) URL, then an attempt to download the file will be made.
      * @param mixed $image
      *
-     * @throws Exception If the image cannot be loaded, or if its mime type is not supported
-     *
      * @return bool True if the image was properly loaded
+     *
+     * @throws Exception If the image cannot be loaded, or if its mime type is not supported
      */
     public function loadFile($image)
     {
@@ -122,9 +122,9 @@ public function loadFile($image)
      * @param mixed $image
      * @param mixed $mime
      *
-     * @throws Exception If image mime type is not supported
-     *
      * @return bool True if the image was properly loaded
+     *
+     * @throws Exception If image mime type is not supported
      */
     public function loadData($image, $mime)
     {
diff --git a/plugins/sfThumbnailPlugin/test/unit/sfThumbnailTest.php b/plugins/sfThumbnailPlugin/test/unit/sfThumbnailTest.php
index 6e6f19d5b9..932a6783f8 100644
--- a/plugins/sfThumbnailPlugin/test/unit/sfThumbnailTest.php
+++ b/plugins/sfThumbnailPlugin/test/unit/sfThumbnailTest.php
@@ -20,7 +20,7 @@
     'invalid' => dirname(__FILE__).'/../data/invalid.txt',
     'blob' => dirname(__FILE__).'/../data/image.blob',
     'image/jpeg' => dirname(__FILE__).'/../data/einstein.jpg',
-    //'image/pjpeg'  => dirname(__FILE__).'/../data/pjpeg.jpg',
+    // 'image/pjpeg'  => dirname(__FILE__).'/../data/pjpeg.jpg',
     'image/png' => dirname(__FILE__).'/../data/gnome.png',
     'image/gif' => dirname(__FILE__).'/../data/symfony.gif',
     'document/pdf' => dirname(__FILE__).'/../data/mogpres.pdf',
@@ -84,11 +84,11 @@ public function diag($message, $adapter = '')
     checkResult($t, 150, 150, 'image/jpeg');
 
     $t->todo('handles image/pjpeg mime type');
-    //$t->diag('handles image/pjpeg mime type');
-    //$thmb = new sfThumbnail(150, 150, false, true, 75, $adapter, array());
-    //$thmb->loadFile($data['image/pjpeg']);
-    //$thmb->save($result.'.jpg');
-    //checkResult($t, 150, 150, 'image/jpeg');
+    // $t->diag('handles image/pjpeg mime type');
+    // $thmb = new sfThumbnail(150, 150, false, true, 75, $adapter, array());
+    // $thmb->loadFile($data['image/pjpeg']);
+    // $thmb->save($result.'.jpg');
+    // checkResult($t, 150, 150, 'image/jpeg');
 
     $t->diag('creates inflated thumbnail');
     $thmb = new sfThumbnail(200, 200, false, true, 75, $adapter, []);
diff --git a/plugins/sfWebBrowserPlugin/lib/sfWebBrowser.class.php b/plugins/sfWebBrowserPlugin/lib/sfWebBrowser.class.php
index bad50d1c0f..5d90a1990a 100644
--- a/plugins/sfWebBrowserPlugin/lib/sfWebBrowser.class.php
+++ b/plugins/sfWebBrowserPlugin/lib/sfWebBrowser.class.php
@@ -553,6 +553,7 @@ public function getResponseText()
                 $text = $this->decodeGzip($text);
 
                 break;
+
             // Handle deflate encoding
             case 'deflate':
                 $text = $this->decodeDeflate($text);
@@ -617,9 +618,9 @@ public function getResponseDomCssSelector()
     /**
      * Get a SimpleXML version of the response.
      *
-     * @throws sfWebBrowserInvalidResponseException when response is not in a valid format
-     *
      * @return SimpleXMLElement The reponse contents
+     *
+     * @throws sfWebBrowserInvalidResponseException when response is not in a valid format
      */
     public function getResponseXML()
     {
diff --git a/plugins/sfWebBrowserPlugin/test/unit/sfWebBrowserTest.php b/plugins/sfWebBrowserPlugin/test/unit/sfWebBrowserTest.php
index c209a30e8b..9aa8ac3c59 100644
--- a/plugins/sfWebBrowserPlugin/test/unit/sfWebBrowserTest.php
+++ b/plugins/sfWebBrowserPlugin/test/unit/sfWebBrowserTest.php
@@ -350,7 +350,7 @@ public function getRequestMethod()
 
     $b = new myTestWebBrowser([], $adapter);
     $b->call($askeet_params['url'].'/index.php/login', 'POST', ['nickname' => $askeet_params['login'], 'password' => $askeet_params['password']]);
-    //$t->like($b->getResponseText(), '/url='.preg_quote($askeet_params['url'], '/').'\/index\.php/', 'does NOT follow a 302 redirect after a POST');
+    // $t->like($b->getResponseText(), '/url='.preg_quote($askeet_params['url'], '/').'\/index\.php/', 'does NOT follow a 302 redirect after a POST');
     $t->like($b->getResponseText(), '/featured questions/', 'follows 302 redirect after POST ****** DESPITE THE HTTP SPEC ******');
     $t->is($b->getRequestMethod(), 'GET', 'request method is changed to GET after POST for 302 redirect ***** DESPITE THE HTTP SPEC *****');
     $t->todo('request method is changed to GET after POST for 303 redirect');
diff --git a/test/functional/qubit/actor/addTest.php b/test/functional/qubit/actor/addTest.php
index 892794d4f6..4b9ea78eb8 100644
--- a/test/functional/qubit/actor/addTest.php
+++ b/test/functional/qubit/actor/addTest.php
@@ -23,8 +23,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'actor')
     ->isParameter('action', 'indexIsaar')
-    ->end()
-;
+    ->end();
 
 $object = QubitObject::getById($browser->getRequest()->id);
 
diff --git a/test/functional/qubit/actor/deleteTest.php b/test/functional/qubit/actor/deleteTest.php
index 28018b6a7c..00c6c8a1e4 100644
--- a/test/functional/qubit/actor/deleteTest.php
+++ b/test/functional/qubit/actor/deleteTest.php
@@ -16,5 +16,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/actor/editTest.php b/test/functional/qubit/actor/editTest.php
index 62989a979d..0587f85c42 100644
--- a/test/functional/qubit/actor/editTest.php
+++ b/test/functional/qubit/actor/editTest.php
@@ -16,5 +16,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/actor/indexTest.php b/test/functional/qubit/actor/indexTest.php
index bc5a5c4904..b53165bb79 100644
--- a/test/functional/qubit/actor/indexTest.php
+++ b/test/functional/qubit/actor/indexTest.php
@@ -15,5 +15,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/advancedSearchTest.php b/test/functional/qubit/advancedSearchTest.php
index 8935f45ed8..eeebf32c34 100644
--- a/test/functional/qubit/advancedSearchTest.php
+++ b/test/functional/qubit/advancedSearchTest.php
@@ -18,29 +18,29 @@
 // Information objects
 // Properties: title, startDate, endDate, shoudlMatchSearch, filter
 $cases = [
-    ['Foobar1-'.$rand,  '0500-02-03', '1100-04-04', false, ['t1', 't2']],  // Case 1
-    ['Foobar2-'.$rand,  '1125-08-02', '1229-11-17', true,  ['t1', 't2']],  // Case 2
-    ['Foobar3-'.$rand,  '1712-01-02', '1992-04-22', false, ['t1', 't2']],  // Case 3
-    ['Foobar4-'.$rand,  '0500-02-03', '1125-08-02', true,  ['t1', 't2']],  // Case 4
-    ['Foobar5-'.$rand,  '0500-02-03', '1992-04-22', true,  ['t1', 't2']],  // Case 5
-    ['Foobar6-'.$rand,  '1229-11-17', '1992-04-22', true,  ['t1', 't2']],  // Case 6
-    ['Foobar7-'.$rand,  '0500-02-03', '1100-04-04', false, ['t1']],        // Case 7
-    ['Foobar8-'.$rand,  '0500-02-03', '1125-08-02', true,  ['t1']],        // Case 8
-    ['Foobar9-'.$rand,  '1125-08-02', '1229-11-17', true, ['t1']],        // Case 9
+    ['Foobar1-'.$rand, '0500-02-03', '1100-04-04', false, ['t1', 't2']],  // Case 1
+    ['Foobar2-'.$rand, '1125-08-02', '1229-11-17', true, ['t1', 't2']],  // Case 2
+    ['Foobar3-'.$rand, '1712-01-02', '1992-04-22', false, ['t1', 't2']],  // Case 3
+    ['Foobar4-'.$rand, '0500-02-03', '1125-08-02', true, ['t1', 't2']],  // Case 4
+    ['Foobar5-'.$rand, '0500-02-03', '1992-04-22', true, ['t1', 't2']],  // Case 5
+    ['Foobar6-'.$rand, '1229-11-17', '1992-04-22', true, ['t1', 't2']],  // Case 6
+    ['Foobar7-'.$rand, '0500-02-03', '1100-04-04', false, ['t1']],        // Case 7
+    ['Foobar8-'.$rand, '0500-02-03', '1125-08-02', true, ['t1']],        // Case 8
+    ['Foobar9-'.$rand, '1125-08-02', '1229-11-17', true, ['t1']],        // Case 9
     ['Foobar10-'.$rand, '1125-08-02', '1229-11-17', true, ['t2']],        // Case 10
-    ['Foobar11-'.$rand, '1229-11-17', '1992-04-22', true,  ['t2']],        // Case 11
+    ['Foobar11-'.$rand, '1229-11-17', '1992-04-22', true, ['t2']],        // Case 11
     ['Foobar12-'.$rand, '1712-01-02', '1992-04-22', false, ['t2']],      // Case 12
-    ['Foobar13-'.$rand,  '2015-00-00', '2020-00-00', true, ['t3', 't4']],    // Case 13
-    ['Foobar14-'.$rand,  '2010-01-01', '2010-12-31', false,  ['t3', 't4']],  // Case 14
-    ['Foobar15-'.$rand,  '2010-01-01', '2015-02-28', true, ['t3', 't4']],    // Case 15
-    ['Foobar16-'.$rand,  '2015-03-03', '2020-00-00', true,  ['t3', 't4']],   // Case 16
-    ['Foobar17-'.$rand,  '2020-00-00', '2025-00-00', false,  ['t3', 't4']],  // Case 17
-    ['Foobar18-'.$rand,  '2010-01-01', '2015-02-26', false,  ['t3']],        // Case 18
-    ['Foobar19-'.$rand,  '2020-00-00', '2025-00-00', true, ['t3']],         // Case 19
-    ['Foobar20-'.$rand,  '2010-01-01', '2020-00-00', true,  ['t3']],         // Case 20
-    ['Foobar21-'.$rand,  '2015-03-03', '2020-00-00', true, ['t4']],        // Case 21
-    ['Foobar22-'.$rand,  '2020-00-00', '2025-00-00', false, ['t4']],        // Case 22
-    ['Foobar23-'.$rand,  '2010-01-01', '2010-12-31', true,  ['t4']],        // Case 23
+    ['Foobar13-'.$rand, '2015-00-00', '2020-00-00', true, ['t3', 't4']],    // Case 13
+    ['Foobar14-'.$rand, '2010-01-01', '2010-12-31', false, ['t3', 't4']],  // Case 14
+    ['Foobar15-'.$rand, '2010-01-01', '2015-02-28', true, ['t3', 't4']],    // Case 15
+    ['Foobar16-'.$rand, '2015-03-03', '2020-00-00', true, ['t3', 't4']],   // Case 16
+    ['Foobar17-'.$rand, '2020-00-00', '2025-00-00', false, ['t3', 't4']],  // Case 17
+    ['Foobar18-'.$rand, '2010-01-01', '2015-02-26', false, ['t3']],        // Case 18
+    ['Foobar19-'.$rand, '2020-00-00', '2025-00-00', true, ['t3']],         // Case 19
+    ['Foobar20-'.$rand, '2010-01-01', '2020-00-00', true, ['t3']],         // Case 20
+    ['Foobar21-'.$rand, '2015-03-03', '2020-00-00', true, ['t4']],        // Case 21
+    ['Foobar22-'.$rand, '2020-00-00', '2025-00-00', false, ['t4']],        // Case 22
+    ['Foobar23-'.$rand, '2010-01-01', '2010-12-31', true, ['t4']],        // Case 23
 ];
 
 // Create information objects
@@ -70,8 +70,7 @@
         ->get(getUrl($tmp1, $tmp2, $item[0]))
         ->with('response')->begin()
         ->checkElement('#search-stats', $item[3] ? 1 : 0)
-        ->end()
-    ;
+        ->end();
 }
 
 function getUrl($startDate, $endDate, $title)
diff --git a/test/functional/qubit/digitalobjectActionsTest.php b/test/functional/qubit/digitalobjectActionsTest.php
index bb1467e67f..e0b0b7bffe 100644
--- a/test/functional/qubit/digitalobjectActionsTest.php
+++ b/test/functional/qubit/digitalobjectActionsTest.php
@@ -16,5 +16,4 @@
     ->with('response')->begin()
     ->isStatusCode(200)
     ->checkElement('body', '/Untitled/')
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/import/eadTest.php b/test/functional/qubit/import/eadTest.php
index 9d282ba0c4..5070830651 100644
--- a/test/functional/qubit/import/eadTest.php
+++ b/test/functional/qubit/import/eadTest.php
@@ -42,8 +42,7 @@ public function files($files)
     ->with('request')->begin()
     ->isParameter('module', 'sfIsadPlugin')
     ->isParameter('action', 'index')
-    ->end()
-;
+    ->end();
 
 $object = QubitObject::getById($browser->getRequest()->id);
 
diff --git a/test/functional/qubit/informationObject/addTest.php b/test/functional/qubit/informationObject/addTest.php
index 0a48d3ed90..b4aa95c4f5 100644
--- a/test/functional/qubit/informationObject/addTest.php
+++ b/test/functional/qubit/informationObject/addTest.php
@@ -21,8 +21,7 @@
     ->end()
     ->with('response')->begin()
     ->checkElement('body', '/Example fonds/')
-    ->end()
-;
+    ->end();
 
 $object = QubitObject::getById($browser->getRequest()->id);
 
diff --git a/test/functional/qubit/informationObject/deleteTest.php b/test/functional/qubit/informationObject/deleteTest.php
index c48df6fce0..69d2ad34b9 100644
--- a/test/functional/qubit/informationObject/deleteTest.php
+++ b/test/functional/qubit/informationObject/deleteTest.php
@@ -15,5 +15,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/informationObject/editTest.php b/test/functional/qubit/informationObject/editTest.php
index 22f7b4a1d6..ad86512471 100644
--- a/test/functional/qubit/informationObject/editTest.php
+++ b/test/functional/qubit/informationObject/editTest.php
@@ -15,5 +15,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/informationObject/indexTest.php b/test/functional/qubit/informationObject/indexTest.php
index 1d495ec19b..8d730520b4 100644
--- a/test/functional/qubit/informationObject/indexTest.php
+++ b/test/functional/qubit/informationObject/indexTest.php
@@ -15,5 +15,4 @@
     ->end()
     ->with('response')->begin()
     ->isStatusCode(404)
-    ->end()
-;
+    ->end();
diff --git a/test/functional/qubit/loginTest.php b/test/functional/qubit/loginTest.php
index 6c0ff8a133..f16fb6ea55 100644
--- a/test/functional/qubit/loginTest.php
+++ b/test/functional/qubit/loginTest.php
@@ -18,8 +18,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'user')
     ->isParameter('action', 'login')
-    ->end()
-;
+    ->end();
 
 $browser->test()->ok(
     $browser->getUser()->isAuthenticated(),
@@ -43,8 +42,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'user')
     ->isParameter('action', 'logout')
-    ->end()
-;
+    ->end();
 
 $browser->test()->ok(
     !$browser->getUser()->isAuthenticated(),
@@ -59,8 +57,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'user')
     ->isParameter('action', 'login')
-    ->end()
-;
+    ->end();
 
 $browser->test()->ok(
     !$browser->getUser()->isAuthenticated(),
@@ -81,8 +78,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'user')
     ->isParameter('action', 'login')
-    ->end()
-;
+    ->end();
 
 $browser->test()->ok(
     $browser->getUser()->isAuthenticated(),
@@ -103,8 +99,7 @@
     ->with('request')->begin()
     ->isParameter('module', 'user')
     ->isParameter('action', 'login')
-    ->end()
-;
+    ->end();
 
 $browser->test()->ok(
     $browser->getUser()->isAuthenticated(),
diff --git a/test/functional/qubit/searchTest.php b/test/functional/qubit/searchTest.php
index 3dc6805877..9b8f0b178f 100644
--- a/test/functional/qubit/searchTest.php
+++ b/test/functional/qubit/searchTest.php
@@ -13,8 +13,7 @@
     ->get(';search?query=testtitle')
     ->with('response')->begin()
     ->checkElement('body', '/testtitle/')
-    ->end()
-;
+    ->end();
 
 $informationObject->title = 'TesTTItLe';
 $informationObject->save();
@@ -23,8 +22,7 @@
     ->get(';search?query=TEsTtiTLE')
     ->with('response')->begin()
     ->checkElement('body', '/TesTTItLe/')
-    ->end()
-;
+    ->end();
 
 // Issue 849
 $informationObject->title = 'testtitlé';
@@ -34,8 +32,7 @@
     ->get(';search?query=testtitle')
     ->with('response')->begin()
     ->checkElement('body', '/testtitlé/')
-    ->end()
-;
+    ->end();
 
 // Issue 848
 $informationObject->title = 'tEStTitLÉ';
@@ -45,8 +42,7 @@
     ->get(';search?query=teSTtiTle')
     ->with('response')->begin()
     ->checkElement('body', '/tEStTitLÉ/')
-    ->end()
-;
+    ->end();
 
 $informationObject->delete();
 
@@ -54,5 +50,4 @@
     ->get(';search?query=testtitle')
     ->with('response')->begin()
     ->checkElement('body', '!/testtitle/')
-    ->end()
-;
+    ->end();
diff --git a/test/mock/QubitPhysicalObject.php b/test/mock/QubitPhysicalObject.php
index 0cc242e949..af8c0b5dc8 100644
--- a/test/mock/QubitPhysicalObject.php
+++ b/test/mock/QubitPhysicalObject.php
@@ -102,11 +102,7 @@ public static function getByName($name, $options = [])
         return $results;
     }
 
-    public function addInfobjRelations(array $infobjIds = null)
-    {
-    }
+    public function addInfobjRelations(?array $infobjIds = null) {}
 
-    public function updateInfobjRelations(array $infobjIds = null)
-    {
-    }
+    public function updateInfobjRelations(?array $infobjIds = null) {}
 }
diff --git a/test/phpunit/CsvImportAuditerTest.php b/test/phpunit/CsvImportAuditerTest.php
index 257fcac29b..f7c922c43a 100644
--- a/test/phpunit/CsvImportAuditerTest.php
+++ b/test/phpunit/CsvImportAuditerTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvImportAuditer
  */
 class CsvImportAuditerTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/PhysicalObjectCsvHoldingsReportTest.php b/test/phpunit/PhysicalObjectCsvHoldingsReportTest.php
index fadb5c1768..b1d2c417cd 100644
--- a/test/phpunit/PhysicalObjectCsvHoldingsReportTest.php
+++ b/test/phpunit/PhysicalObjectCsvHoldingsReportTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @internal
+ *
  * @covers \QubitPhysicalObjectCsvHoldingsReport
  */
 class PhysicalObjectCsvHoldingsReportTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/PhysicalobjectCsvImporterTest.php b/test/phpunit/PhysicalobjectCsvImporterTest.php
index 5488d387b7..d97fda06c1 100644
--- a/test/phpunit/PhysicalobjectCsvImporterTest.php
+++ b/test/phpunit/PhysicalobjectCsvImporterTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \PhysicalObjectCsvImporter
  */
 class PhysicalObjectCsvImporterTest extends \PHPUnit\Framework\TestCase
@@ -673,8 +674,7 @@ public function testGetTypeIdLookupTable()
     {
         $stub = $this->createStub(QubitTaxonomy::class);
         $stub->method('getTermNameToIdLookupTable')
-            ->willReturn($this->typeIdLookupTableFixture)
-        ;
+            ->willReturn($this->typeIdLookupTableFixture);
 
         $importer = new PhysicalObjectCsvImporter($this->context, $this->vdbcon);
         $importer->setPhysicalObjectTypeTaxonomy($stub);
@@ -689,8 +689,7 @@ public function testGetTypeIdLookupTableExceptionGettingTerms()
     {
         $stub = $this->createStub(QubitTaxonomy::class);
         $stub->method('getTermNameToIdLookupTable')
-            ->willReturn(null)
-        ;
+            ->willReturn(null);
 
         $importer = new PhysicalObjectCsvImporter($this->context, $this->vdbcon);
         $importer->setPhysicalObjectTypeTaxonomy($stub);
diff --git a/test/phpunit/csvImportValidator/CsvBaseValidatorTest.php b/test/phpunit/csvImportValidator/CsvBaseValidatorTest.php
index a844d216e2..642ae94eba 100644
--- a/test/phpunit/csvImportValidator/CsvBaseValidatorTest.php
+++ b/test/phpunit/csvImportValidator/CsvBaseValidatorTest.php
@@ -1,11 +1,10 @@
 <?php
 
-class CsvMockValidator extends CsvBaseValidator
-{
-}
+class CsvMockValidator extends CsvBaseValidator {}
 
 /**
  * @internal
+ *
  * @covers \CsvBaseValidator
  */
 class CsvBaseValidatorTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvColumnCountTest.php b/test/phpunit/csvImportValidator/CsvColumnCountTest.php
index 0b08b5d249..9788988d19 100644
--- a/test/phpunit/csvImportValidator/CsvColumnCountTest.php
+++ b/test/phpunit/csvImportValidator/CsvColumnCountTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvColumnCountValidator
  */
 class CsvColumnCountTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvColumnNameTest.php b/test/phpunit/csvImportValidator/CsvColumnNameTest.php
index 6123ef5971..2077472121 100644
--- a/test/phpunit/csvImportValidator/CsvColumnNameTest.php
+++ b/test/phpunit/csvImportValidator/CsvColumnNameTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvColumnNameValidator
  */
 class CsvColumnNameTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvCultureTest.php b/test/phpunit/csvImportValidator/CsvCultureTest.php
index 3eba09f6a5..03a4987d0c 100644
--- a/test/phpunit/csvImportValidator/CsvCultureTest.php
+++ b/test/phpunit/csvImportValidator/CsvCultureTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvCultureValidator
  */
 class CsvCultureTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvDigitalObjectPathTest.php b/test/phpunit/csvImportValidator/CsvDigitalObjectPathTest.php
index b77fdd1b9d..9be462747d 100644
--- a/test/phpunit/csvImportValidator/CsvDigitalObjectPathTest.php
+++ b/test/phpunit/csvImportValidator/CsvDigitalObjectPathTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvDigitalObjectPathValidator
  */
 class CsvDigitalObjectPathTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvDigitalObjectUriTest.php b/test/phpunit/csvImportValidator/CsvDigitalObjectUriTest.php
index d5632458cd..b97fe06cfc 100644
--- a/test/phpunit/csvImportValidator/CsvDigitalObjectUriTest.php
+++ b/test/phpunit/csvImportValidator/CsvDigitalObjectUriTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvDigitalObjectUriValidator
  */
 class CsvDigitalObjectUriTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvDuplicateColumnNameTest.php b/test/phpunit/csvImportValidator/CsvDuplicateColumnNameTest.php
index 7103f15ff5..a67033221b 100644
--- a/test/phpunit/csvImportValidator/CsvDuplicateColumnNameTest.php
+++ b/test/phpunit/csvImportValidator/CsvDuplicateColumnNameTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvDuplicateColumnNameValidator
  */
 class CsvDuplicateColumnNameTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvEmptyRowTest.php b/test/phpunit/csvImportValidator/CsvEmptyRowTest.php
index 368d7093eb..a704bc996d 100644
--- a/test/phpunit/csvImportValidator/CsvEmptyRowTest.php
+++ b/test/phpunit/csvImportValidator/CsvEmptyRowTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvEmptyRowValidator
  */
 class CsvEmptyRowTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvEventValuesTest.php b/test/phpunit/csvImportValidator/CsvEventValuesTest.php
index 6f247f5c03..dc9529da3e 100644
--- a/test/phpunit/csvImportValidator/CsvEventValuesTest.php
+++ b/test/phpunit/csvImportValidator/CsvEventValuesTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvEventValuesValidator
  */
 class CsvEventValuesTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvFieldLengthTest.php b/test/phpunit/csvImportValidator/CsvFieldLengthTest.php
index c9c6f77533..8c0706b07f 100644
--- a/test/phpunit/csvImportValidator/CsvFieldLengthTest.php
+++ b/test/phpunit/csvImportValidator/CsvFieldLengthTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvFieldLengthValidator
  */
 class CsvFieldLengthTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvFileEncodingTest.php b/test/phpunit/csvImportValidator/CsvFileEncodingTest.php
index f453972eb0..743125d06f 100644
--- a/test/phpunit/csvImportValidator/CsvFileEncodingTest.php
+++ b/test/phpunit/csvImportValidator/CsvFileEncodingTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvFileEncodingValidator
  */
 class CsvFileEncodingTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvLanguageTest.php b/test/phpunit/csvImportValidator/CsvLanguageTest.php
index 5564045667..0d089beb18 100644
--- a/test/phpunit/csvImportValidator/CsvLanguageTest.php
+++ b/test/phpunit/csvImportValidator/CsvLanguageTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvLanguageValidator
  */
 class CsvLanguageTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvLegacyIdTest.php b/test/phpunit/csvImportValidator/CsvLegacyIdTest.php
index 738b1411bd..ce72887f9a 100644
--- a/test/phpunit/csvImportValidator/CsvLegacyIdTest.php
+++ b/test/phpunit/csvImportValidator/CsvLegacyIdTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvLegacyIdValidator
  */
 class CsvLegacyIdTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvParentTest.php b/test/phpunit/csvImportValidator/CsvParentTest.php
index e05695bf1f..d1b8b73ff2 100644
--- a/test/phpunit/csvImportValidator/CsvParentTest.php
+++ b/test/phpunit/csvImportValidator/CsvParentTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvParentValidator
  */
 class CsvParentTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvRepoTest.php b/test/phpunit/csvImportValidator/CsvRepoTest.php
index ea272e4e98..eb101cfef3 100644
--- a/test/phpunit/csvImportValidator/CsvRepoTest.php
+++ b/test/phpunit/csvImportValidator/CsvRepoTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvRepoValidator
  */
 class CsvRepoTest extends \PHPUnit\Framework\TestCase
@@ -61,7 +62,7 @@ public function setUp(): void
 
         $this->ormClasses = [
             'QubitFlatfileImport' => \AccessToMemory\test\mock\QubitFlatfileImport::class,
-            //'QubitObject' => \AccessToMemory\test\mock\QubitObject::class,
+            // 'QubitObject' => \AccessToMemory\test\mock\QubitObject::class,
         ];
     }
 
diff --git a/test/phpunit/csvImportValidator/CsvSampleValuesTest.php b/test/phpunit/csvImportValidator/CsvSampleValuesTest.php
index 3891367904..33146257de 100644
--- a/test/phpunit/csvImportValidator/CsvSampleValuesTest.php
+++ b/test/phpunit/csvImportValidator/CsvSampleValuesTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvSampleValuesValidator
  */
 class CsvSampleValuesTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvScriptTest.php b/test/phpunit/csvImportValidator/CsvScriptTest.php
index c5d8aa314c..6203995c22 100644
--- a/test/phpunit/csvImportValidator/CsvScriptTest.php
+++ b/test/phpunit/csvImportValidator/CsvScriptTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvScriptValidator
  */
 class CsvScriptTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvValidatorCollectionTest.php b/test/phpunit/csvImportValidator/CsvValidatorCollectionTest.php
index eab4bd0dce..4af4259090 100644
--- a/test/phpunit/csvImportValidator/CsvValidatorCollectionTest.php
+++ b/test/phpunit/csvImportValidator/CsvValidatorCollectionTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvValidatorCollection
  */
 class CsvValidatorCollectionTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvValidatorResultCollectionTest.php b/test/phpunit/csvImportValidator/CsvValidatorResultCollectionTest.php
index 79ec29420a..aa1117ca43 100644
--- a/test/phpunit/csvImportValidator/CsvValidatorResultCollectionTest.php
+++ b/test/phpunit/csvImportValidator/CsvValidatorResultCollectionTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvValidatorResultCollection
  */
 class CsvValidatorResultCollectionTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvValidatorResultTest.php b/test/phpunit/csvImportValidator/CsvValidatorResultTest.php
index a5371399de..84fd611ab3 100644
--- a/test/phpunit/csvImportValidator/CsvValidatorResultTest.php
+++ b/test/phpunit/csvImportValidator/CsvValidatorResultTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvValidatorResult
  */
 class CsvValidatorResultTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/csvImportValidator/CsvValidatorTest.php b/test/phpunit/csvImportValidator/CsvValidatorTest.php
index 3e1351ceca..bc46a4ff3d 100644
--- a/test/phpunit/csvImportValidator/CsvValidatorTest.php
+++ b/test/phpunit/csvImportValidator/CsvValidatorTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @internal
+ *
  * @covers \CsvImportValidator
  */
 class CsvValidatorTest extends \PHPUnit\Framework\TestCase
diff --git a/test/phpunit/settingsTaskTest.php b/test/phpunit/settingsTaskTest.php
index e174ab4cd7..87a12c0393 100644
--- a/test/phpunit/settingsTaskTest.php
+++ b/test/phpunit/settingsTaskTest.php
@@ -4,6 +4,7 @@
 
 /**
  * @internal
+ *
  * @covers \settingsTask
  */
 class settingsTaskTest extends \PHPUnit\Framework\TestCase
diff --git a/test/unit/audit/CodeAuditTest.php b/test/unit/audit/CodeAuditTest.php
index cbcf49f15c..6c5b73ec14 100644
--- a/test/unit/audit/CodeAuditTest.php
+++ b/test/unit/audit/CodeAuditTest.php
@@ -60,27 +60,27 @@
 }
 
 $snifferExceptions = [
-    //'\.yml$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/config\/config\.php$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/config\/tidy\.conf$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/lib\/helper\/mySubmitTagHelper\.php$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/modules\/[^\/]+\/templates\/[^\/.]+\.php$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/templates\/[^\/.]+\.php$',
+    // '\.yml$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/config\/config\.php$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/config\/tidy\.conf$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/lib\/helper\/mySubmitTagHelper\.php$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/modules\/[^\/]+\/templates\/[^\/.]+\.php$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/apps\/qubit\/templates\/[^\/.]+\.php$',
     preg_quote(SF_ROOT_DIR, '/').'\/batch\/[^\/.]+\.php$',
     preg_quote(SF_ROOT_DIR, '/').'\/config\/[^\/.]+\.[^\/]+$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/COPYRIGHT$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/data',
+    // preg_quote(SF_ROOT_DIR, '/').'\/COPYRIGHT$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/data',
     preg_quote(SF_ROOT_DIR, '/').'\/lib\/GoogleMapAPI',
     preg_quote(SF_ROOT_DIR, '/').'\/lib\/model\/map\/[^\/.]+\.php$',
     preg_quote(SF_ROOT_DIR, '/').'\/lib\/model\/om\/[^\/.]+\.php$',
     preg_quote(SF_ROOT_DIR, '/').'\/lib\/PHP',
-    //preg_quote(SF_ROOT_DIR, '/').'\/LICENSE$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/README$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/LICENSE$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/README$',
     preg_quote(SF_ROOT_DIR, '/').'\/symfony$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/test\/archival_description\/[^\/.]+\.php$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/test\/archival_description\/[^\/.]+\.php$',
     preg_quote(SF_ROOT_DIR, '/').'\/test\/bootstrap\/[^\/.]+\.php$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/test\/functional\/qubit\/[^\/.]+\.php$',
-    //preg_quote(SF_ROOT_DIR, '/').'\/web')).'/';
+    // preg_quote(SF_ROOT_DIR, '/').'\/test\/functional\/qubit\/[^\/.]+\.php$',
+    // preg_quote(SF_ROOT_DIR, '/').'\/web')).'/';
 ];
 
 function _readDir($dirPath, &$filePaths)
diff --git a/test/unit/routingTest.php b/test/unit/routingTest.php
index 974de34ad9..99d221de94 100644
--- a/test/unit/routingTest.php
+++ b/test/unit/routingTest.php
@@ -40,7 +40,8 @@
 }
 $io = new QubitInformationObject();
 $io->parentId = QubitInformationObject::ROOT_ID;
-$io->slug = 'peanut-12345'; $io->save();
+$io->slug = 'peanut-12345';
+$io->save();
 
 $t->diag('Create QubitActor "actor-12345"');
 if (null !== $actor = QubitObject::getBySlug('actor-12345')) {
@@ -79,7 +80,9 @@
 $taxonomy->save();
 
 $t->diag('Create QubitContactInformation');
-$contactInformation = new QubitContactInformation(); $contactInformation->actor = $actor; $contactInformation->save();
+$contactInformation = new QubitContactInformation();
+$contactInformation->actor = $actor;
+$contactInformation->save();
 
 // Test generation of routes
 $t->diag('Test suite intended to check behaviour of ->generate()');
@@ -192,7 +195,7 @@
 $t->is($info['module'], 'foo');
 $t->is($info['action'], 'bar');
 
-//#
+// #
 // QubitMetadataResource
 //
 
@@ -215,15 +218,16 @@
     // Update object
     $io->displayStandardId = $term->id;
     $io->save();
-    $t->diag('/peanut-12345 '.'(displayStandardId points to '.$term->code.')');
+    $t->diag('/peanut-12345 (displayStandardId points to '.$term->code.')');
     $info = $routing->parse('/peanut-12345');
     $t->is($routing->getCurrentRouteName(), 'slug');
     $t->is($info['module'], $ioTemplates[$term->code], $ioTemplates[$term->code]);
     $t->is($info['action'], 'index');
 }
 
-$io->displayStandardId = null; $io->save();
-$t->diag('/peanut-12345 '.'(displayStandardId is NULL, default application template is '.$defaultIoTemplateCode.')');
+$io->displayStandardId = null;
+$io->save();
+$t->diag('/peanut-12345 (displayStandardId is NULL, default application template is '.$defaultIoTemplateCode.')');
 $info = $routing->parse('/peanut-12345');
 $t->is($routing->getCurrentRouteName(), 'slug');
 $t->is($info['module'], $defaultIoTemplateModule, $defaultIoTemplateModule);