Use http constants where appropriate

flack · Feb 22, 2024 · e155c68 · e155c68
1 parent 1154fec
commit e155c68
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/lib/midcom/application.php b/lib/midcom/application.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use midcom\bundle\midcomBundle;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Main controlling instance of the MidCOM Framework
@@ -315,7 +316,7 @@ public function header(string $header, int $response_code = 0)
      * midcom_finish and exit, so it will never return. If the headers have already
      * been sent, this will leave you with a partially completed page, so beware.
      */
-    public function relocate(string $url, int $response_code = 302)
+    public function relocate(string $url, int $response_code = Response::HTTP_FOUND)
     {
         $response = new midcom_response_relocate($url, $response_code);
         $response->send();

diff --git a/lib/midcom/baseclasses/components/handler/rest.php b/lib/midcom/baseclasses/components/handler/rest.php
@@ -179,7 +179,7 @@ protected function _process_request() : JsonResponse
 
             // no response has been set
             if ($this->_response === null) {
-                $this->_stop('Could not handle request, unknown method', 405);
+                $this->_stop('Could not handle request, unknown method', Response::HTTP_METHOD_NOT_ALLOWED);
             }
         } catch (midcom_error $e) {
             $this->_responseStatus = $e->getCode();

diff --git a/lib/midcom/core/urlmethods.php b/lib/midcom/core/urlmethods.php
@@ -77,7 +77,7 @@ public function process_permalink(string $guid) : Response
         }
 
         // We use "302 Found" here so that search engines and others will keep using the PermaLink instead of the temporary
-        return new midcom_response_relocate($destination, 302);
+        return new midcom_response_relocate($destination, Response::HTTP_FOUND);
     }
 
     /**

diff --git a/lib/net/nemein/wiki/handler/notfound.php b/lib/net/nemein/wiki/handler/notfound.php
@@ -24,7 +24,7 @@ public function _handler_notfound(string $wikiword, array &$data)
         $result = $qb->execute();
         if (!empty($result)) {
             // This wiki page actually exists, so go there as "Permanent Redirect"
-            return new midcom_response_relocate("{$result[0]->name}/", 301);
+            return new midcom_response_relocate("{$result[0]->name}/", Response::HTTP_MOVED_PERMANENTLY);
         }
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n->get('"%s" not found'), $wikiword));

diff --git a/lib/net/nemein/wiki/handler/view.php b/lib/net/nemein/wiki/handler/view.php
@@ -8,6 +8,7 @@
 
 use midcom\datamanager\datamanager;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Wikipage view handler
@@ -116,7 +117,7 @@ private function _load_page(string $wikiword, bool $autocreate = true)
             $result = $qb->execute();
             if (!empty($result)) {
                 // This wiki page actually exists, so go there as "Permanent Redirect"
-                return new midcom_response_relocate($this->router->generate('view', ['wikipage' => $result[0]->name]), 301);
+                return new midcom_response_relocate($this->router->generate('view', ['wikipage' => $result[0]->name]), Response::HTTP_MOVED_PERMANENTLY);
             }
         }
         if ($autocreate) {