Merge pull request #2997 from ritankarsaha/ritankarsaha/fix/2833/phpfatalerror

shaheemazmalmmd · web-flow · commit 9bdb0730c1ed · 2025-05-29T14:45:57.000+05:30
Fix(phpfatalerror): fixed uncaught error to member function getRisk()
diff --git a/src/lib/php/Report/LicenseMainGetter.php b/src/lib/php/Report/LicenseMainGetter.php
@@ -39,13 +39,17 @@ protected function getStatements($uploadId, $uploadTreeTableName, $groupId = nul
     $allStatements = array();
     foreach ($mainLicIds as $originLicenseId) {
       $allLicenseCols = $this->licenseDao->getLicenseById($originLicenseId, $groupId);
+      // Null-check: if the license is missing, log and skip this ID.
+      if ($allLicenseCols === null) {
+        error_log("Error: License ID " . $originLicenseId . " not found in the database.");
+        exit;
+      }
       $allStatements[] = array(
         'licenseId' => $originLicenseId,
         'risk' => $allLicenseCols->getRisk(),
         'content' => $licenseMap->getProjectedSpdxId($originLicenseId),
         'text' => $allLicenseCols->getText(),
-        'name' => $licenseMap->getProjectedShortname($originLicenseId,
-            $allLicenseCols->getShortName())
+        'name' => $licenseMap->getProjectedShortname($originLicenseId, $allLicenseCols->getShortName())
       );
     }
     return $allStatements;
diff --git a/src/lib/php/Report/ReportUtils.php b/src/lib/php/Report/ReportUtils.php
@@ -248,6 +248,12 @@ public function getFilesWithLicensesFromClearings(
           ->addAcknowledgement($clearingLicense->getAcknowledgement());
         $reportedLicenseId = $this->licenseMap->getProjectedId($clearingLicense->getLicenseId());
         $concludedLicense = $this->licenseDao->getLicenseById($reportedLicenseId, $groupId);
+        if ($concludedLicense === null) {
+          error_log(
+              "ReportUtils: warning: clearing-license {$reportedLicenseId} not found; skipping event."
+          );
+          continue;
+        }
         if ($clearingEvent->getReportinfo()) {
           $customLicenseText = $clearingEvent->getReportinfo();
           $reportedLicenseShortname = $concludedLicense->getShortName() . '-' .
diff --git a/src/spdx/agent/spdx.php b/src/spdx/agent/spdx.php
@@ -224,23 +224,20 @@ function processUploadId($uploadId)
     }
     $this->licenseMap = new LicenseMap($this->dbManager, $this->groupId, LicenseMap::REPORT, true);
     $this->computeUri($uploadId);
-
     $docLicense = $this->licenseDao->getLicenseByShortName(self::DATA_LICENSE);
     $docLicenseId = $docLicense->getId() . "-" . md5($docLicense->getText());
     $this->licensesInDocument[$docLicenseId] = (new SpdxLicenseInfo())
       ->setLicenseObj($docLicense)
       ->setListedLicense(true)
       ->setCustomText(false)
       ->setTextPrinted(true);
-
     $packageNodes = $this->renderPackage($uploadId);
     $additionalUploadIds = array_key_exists(self::UPLOAD_ADDS,$args) ? explode(',',$args[self::UPLOAD_ADDS]) : array();
     $packageIds = array($uploadId);
     foreach ($additionalUploadIds as $additionalId) {
       $packageNodes .= $this->renderPackage($additionalId);
       $packageIds[] = $additionalId;
     }
-
     $this->writeReport($packageNodes, $packageIds, $uploadId);
     return true;
   }
@@ -384,6 +381,12 @@ protected function renderPackage($uploadId)
     foreach ($mainLicenseIds as $licId) {
       $reportedLicenseId = $this->licenseMap->getProjectedId($licId);
       $mainLicense = $this->licenseDao->getLicenseById($reportedLicenseId, $this->groupId);
+      if ($mainLicense === null) {
+        error_log(
+            "spdx: Error: main license ID {$reportedLicenseId} not found; skipping."
+        );
+        exit;
+      }
       $reportLicId = $mainLicense->getId() . "-" . md5($mainLicense->getText());
       $mainLicenses[] = $reportLicId;
       if (!array_key_exists($reportLicId, $this->licensesInDocument)) {
