Merge pull request #1627 from ConductionNL/fix/deprecations

Fix deprecations
ConductionNL · Mar 19, 2024 · a710f00 · a710f00
2 parents 17c18c5 + d37c441
commit a710f00
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 306 deletions.
diff --git a/api/src/Controller/ZZController.php b/api/src/Controller/ZZController.php
@@ -105,7 +105,7 @@ public function dynamicAction(
      *
      * @return array The parameter arrau
      */
-    private function getParametersFromRequest(?array $parameters = [], ?Request $request): array
+    private function getParametersFromRequest(?array $parameters = [], ?Request $request = null): array
     {
         // Lets make sure that we always have a path
         if (!isset($parameters['path'])) {

diff --git a/api/src/Security/DigispoofAuthenticator.php b/api/src/Security/DigispoofAuthenticator.php
diff --git a/api/src/Security/OauthAuthenticator.php b/api/src/Security/OauthAuthenticator.php
diff --git a/api/src/Service/FormIOService.php b/api/src/Service/FormIOService.php
@@ -121,7 +121,7 @@ private function createIDComponent(string $id, string $preSetKey = null): array
      *
      * @return string Extended key
      */
-    private function extendPreSetKey(?string $preSetKey = null, string $attrName): string
+    private function extendPreSetKey(string $attrName, ?string $preSetKey = null): string
     {
         return $preSetKey ? $preSetKey = $preSetKey.'['.$attrName.']' : $preSetKey = $attrName;
     }
@@ -172,7 +172,7 @@ private function checkIfWeAreLooping(Attribute $attr, string $parentAttribute)
      */
     private function createEntityAsAttribute(Attribute $attr, string $preSetKey = null, $defaultValue = null): array
     {
-        $preSetKey = $this->extendPreSetKey($preSetKey, $attr->getName());
+        $preSetKey = $this->extendPreSetKey($attr->getName(), $preSetKey);
 
         // if ($preSetKey == 'taxonomies[openpubAudience]') {
         //     var_dump($preSetKey);
@@ -296,7 +296,7 @@ private function createUriAttribute(Attribute $attr, string $preSetKey = null, $
      */
     private function createNormalAttribute(Attribute $attr, string $preSetKey = null, $defaultValue = null): array
     {
-        $preSetKey = $this->extendPreSetKey($preSetKey, $attr->getName());
+        $preSetKey = $this->extendPreSetKey($attr->getName(), $preSetKey);
 
         $component = $this->basicComponent;
         $component['label'] = $attr->getName().($attr->getRequired() ? '*' : '');