Merge pull request #1488 from Orange-OpenSource/feat/orange-opensourc…

…e/1362/user-copyright-on-spdx

feat(spdx): add user found copyrights to SPDX reports
Tested-by: shaheem.azmal@siemens.com
Review-by: shaheem.azmal@siemens.com

src/spdx2/agent/spdx2.php

@@ -527,10 +527,14 @@ protected function addCopyrightResults(&$filesWithLicenses, $uploadId)
     /* @var $copyrightDao CopyrightDao */
     $copyrightDao = $this->container->get('dao.copyright');
     $uploadtreeTable = $this->uploadDao->getUploadtreeTableName($uploadId);
-    $allEntries = $copyrightDao->getAllEntries('copyright', $uploadId, $uploadtreeTable, $type='statement');
-    foreach ($allEntries as $finding) {
+    $allScannerEntries = $copyrightDao->getScannerEntries('copyright', $uploadtreeTable, $uploadId, $type='statement', $extrawhere=null);
+    $allEditedEntries = $copyrightDao->getEditedEntries('copyright_decision', $uploadtreeTable, $uploadId, $decisionType=null);
+    foreach ($allScannerEntries as $finding) {
       $filesWithLicenses[$finding['uploadtree_pk']]['copyrights'][] = \convertToUTF8($finding['content'],false);
     }
+    foreach ($allEditedEntries as $finding) {
+      $filesWithLicenses[$finding['uploadtree_pk']]['copyrights'][] = \convertToUTF8($finding['textfinding'],false);
+    }
   }
 
   /**