Merge pull request #18 from d3yii2/d3filesprewieBug

Fixed bug
d3yii2 · Oct 8, 2019 · b93c3a3 · b93c3a3
2 parents a8e400f + 47d355e
commit b93c3a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/views/d3files/_modal_button.php b/views/d3files/_modal_button.php
@@ -2,11 +2,7 @@
 
 use d3yii2\d3files\widgets\D3FilesPreviewWidget;
 use d3yii2\d3files\widgets\D3FilesWidget;
-use d3yii2\pdfobject\widgets\PDFObject;
-use eaBlankonThema\widget\ThModal;
 use yii\helpers\Html;
-use yii\helpers\Json;
-use yii\helpers\Url;
 
 /**
  * @var string $icon
@@ -16,8 +12,7 @@
  * @var int $modelId
  */
 
-$file = D3FilesWidget::getFirstFileHavingExt($fileList, 'pdf');
-
-$attrs = D3FilesPreviewWidget::getPreviewModalButtonAttributes($modelId, $file, $fileList, $urlPrefix);
-
-echo Html::a('<span class="' . $icon . '"></span>', 'javascript:void(0)', $attrs);
+if($file = D3FilesWidget::getFirstFileHavingExt($fileList, 'pdf')) {
+    $attrs = D3FilesPreviewWidget::getPreviewModalButtonAttributes($modelId, $file, $fileList, $urlPrefix);
+    echo Html::a('<span class="' . $icon . '"></span>', 'javascript:void(0)', $attrs);
+}
diff --git a/widgets/D3FilesWidget.php b/widgets/D3FilesWidget.php
@@ -5,7 +5,6 @@
 use d3yii2\d3files\D3Files;
 use d3yii2\d3files\models\D3files as ModelD3Files;
 use Exception;
-use ReflectionException;
 use Yii;
 use yii\base\Widget;
 use yii\db\ActiveRecord;
@@ -29,6 +28,8 @@
  * @var string $urlPrefix
  * @var string VIEW_DROPDOWN_LIST
  * @var string VIEW_FILES_LIST
+ *
+ * @property array $viewParams
  */
 class D3FilesWidget extends Widget
 {
@@ -69,7 +70,6 @@ class D3FilesWidget extends Widget
     public const VIEW_FILES_LIST = 'files-list';
 
     /**
-     * @throws ReflectionException
      * @throws \yii\db\Exception
      * @throws Exception
      */
@@ -170,15 +170,15 @@ public static function getFileExtension(array $file): string
      * @param string $extension
      * @return array|null
      */
-    public static function getFirstFileHavingExt(array $files, string $extension): ?array
+    public static function getFirstFileHavingExt(array $files, string $extension): array
     {
         foreach ($files as $file) {
             $fileExtension = strtolower(pathinfo($file['file_name'], PATHINFO_EXTENSION));
             if ($extension === $fileExtension) {
                 return $file;
             }
         }
-        return null;
+        return [];
     }
 
     /**