Fix some issues reported by scrutinizer

tvdijen · tvdijen · commit eca437f4c249 · 2023-05-12T16:53:25.000+02:00
diff --git a/modules/admin/src/Controller/Test.php b/modules/admin/src/Controller/Test.php
@@ -171,7 +171,7 @@ public function main(Request $request, string $as = null): Response
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return \SimpleSAML\XHTML\Template
      */
-    public function logout(Request $request): Template
+    public function logout(/** @scrutinizer-ignore-unused*/Request $request): Template
     {
         return new Template($this->config, 'admin:logout.twig');
     }
diff --git a/src/SimpleSAML/Error/Error.php b/src/SimpleSAML/Error/Error.php
@@ -246,7 +246,6 @@ public function show(): void
             && $config->getOptionalString('technicalcontact_email', 'na@example.org') !== 'na@example.org'
         ) {
             // enable error reporting
-            $httpUtils = new Utils\HTTP();
             $data['errorReportAddress'] = Module::getModuleURL('core/errorReport');
         }
 
diff --git a/src/SimpleSAML/Kernel.php b/src/SimpleSAML/Kernel.php
@@ -171,6 +171,7 @@ private function registerModuleControllers(ContainerBuilder $container): void
                 $controllerDir . '/*'
             );
         } catch (FileLocatorFileNotFoundException $e) {
+            // fall through
         }
     }
 }
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageSource.php b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -325,27 +325,4 @@ protected function lookupIndexFromEntityId(string $entityId, array $metadataSet)
 
         return null;
     }
-
-
-    /**
-     * @param string $set
-     * @throws \Exception
-     * @return string
-     */
-    private function getDynamicHostedUrl(string $set): string
-    {
-        // get the configuration
-        $httpUtils = new Utils\HTTP();
-        $baseUrl = $httpUtils->getBaseURL();
-
-        if ($set === 'saml20-idp-hosted') {
-            return $baseUrl . 'saml2/idp/metadata.php';
-        } elseif ($set === 'saml20-sp-hosted') {
-            return $baseUrl . 'saml2/sp/metadata.php';
-        } elseif ($set === 'adfs-idp-hosted') {
-            return 'urn:federation:' . $httpUtils->getSelfHost() . ':idp';
-        } else {
-            throw new \Exception('Can not generate dynamic EntityID for metadata of this type: [' . $set . ']');
-        }
-    }
 }
diff --git a/src/SimpleSAML/Metadata/Sources/MDQ.php b/src/SimpleSAML/Metadata/Sources/MDQ.php
@@ -287,7 +287,7 @@ public function getMetaData(string $entityId, string $set): ?array
         if (isset($data)) {
             if (array_key_exists('expire', $data) && $data['expire'] < time()) {
                 // metadata has expired
-                $data = null;
+                unset($data);
             } else {
                 // metadata found in cache and not expired
                 Logger::debug(sprintf('%s: using cached metadata for: %s.', __CLASS__, $entityId));
diff --git a/src/SimpleSAML/XHTML/Template.php b/src/SimpleSAML/XHTML/Template.php
@@ -567,12 +567,10 @@ public function getContents(): string
     /**
      * Send this template as a response.
      *
-     * @return $this This response.
+     * @return \Symfony\Component\HttpFoundation\Response This response.
      * @throws \Exception if the template cannot be found.
-     *
-     * Note: No return type possible due to upstream limitations
      */
-    public function send(): static
+    public function send(): Response
     {
         $this->content = $this->getContents();
         return parent::send();

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public function main(Request $request, string $as = null): Response`
`171`	`171`	`* @param \Symfony\Component\HttpFoundation\Request $request`
`172`	`172`	`* @return \SimpleSAML\XHTML\Template`
`173`	`173`	`*/`
`174`		`- public function logout(Request $request): Template`
	`174`	`+ public function logout(/** @scrutinizer-ignore-unused*/Request $request): Template`
`175`	`175`	`{`
`176`	`176`	`return new Template($this->config, 'admin:logout.twig');`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,6 @@ public function show(): void`
`246`	`246`	`&& $config->getOptionalString('technicalcontact_email', '[email protected]') !== '[email protected]'`
`247`	`247`	`) {`
`248`	`248`	`// enable error reporting`
`249`		`- $httpUtils = new Utils\HTTP();`
`250`	`249`	`$data['errorReportAddress'] = Module::getModuleURL('core/errorReport');`
`251`	`250`	`}`
`252`	`251`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ private function registerModuleControllers(ContainerBuilder $container): void`
`171`	`171`	`$controllerDir . '/*'`
`172`	`172`	`);`
`173`	`173`	`} catch (FileLocatorFileNotFoundException $e) {`
	`174`	`+ // fall through`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`	`}`