From 51c4ca115aba6153618bd9300ff98192bd4122f7 Mon Sep 17 00:00:00 2001 From: Lorenzo Giacomelli Date: Tue, 26 Jan 2016 14:59:13 +0100 Subject: [PATCH] Fix asText dei mediaRender ora richiede array default nullo --- private/lib/media/MediaRendererInterface.php | 4 ++-- private/lib/media/mediaRenderers/MediaHtml5.php | 6 +++--- private/lib/media/mediaRenderers/MediaImage.php | 10 +++++++--- private/lib/media/mediaRenderers/MediaLocalVideo.php | 6 +++--- private/lib/media/mediaRenderers/MediaPdf.php | 6 +++--- private/lib/media/mediaRenderers/MediaYoutube.php | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/private/lib/media/MediaRendererInterface.php b/private/lib/media/MediaRendererInterface.php index 577f248..9e1bcbb 100644 --- a/private/lib/media/MediaRendererInterface.php +++ b/private/lib/media/MediaRendererInterface.php @@ -2,7 +2,7 @@ interface MediaRendererInterface{ - public function asText(); - public function render(); + public function asText(array $opt = array()) ; + public function render(array $opt = array()); } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaHtml5.php b/private/lib/media/mediaRenderers/MediaHtml5.php index a0555b1..93860d1 100644 --- a/private/lib/media/mediaRenderers/MediaHtml5.php +++ b/private/lib/media/mediaRenderers/MediaHtml5.php @@ -7,12 +7,12 @@ class MediaHtml5 implements MediaRendererInterface{ $this->code = $code; } - public function asText(){ + public function asText(array $opt = array()){ return $this->code; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php index 61ac098..1895c4a 100644 --- a/private/lib/media/mediaRenderers/MediaImage.php +++ b/private/lib/media/mediaRenderers/MediaImage.php @@ -6,12 +6,16 @@ class MediaImage implements MediaRendererInterface{ $this->id = $id; } - public function asText($size){ + public function asText(array $opt = array()){ + $size = "small"; + if(sizeof($opt)>0 && array_key_exists("size", $opt)){ + $size = $opt["size"]; + } return ''; } - public function render($size = "small"){ - echo $this->asText($size); + public function render(array $opt = array ()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php index 7e8ee0c..bd5ba78 100644 --- a/private/lib/media/mediaRenderers/MediaLocalVideo.php +++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php @@ -7,12 +7,12 @@ class MediaLocalVideo implements MediaRendererInterface{ $this->id = $id; } - public function asText(){ + public function asText(array $opt = array()){ return $this->id; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaPdf.php b/private/lib/media/mediaRenderers/MediaPdf.php index 4ad7eb1..1ef3efb 100644 --- a/private/lib/media/mediaRenderers/MediaPdf.php +++ b/private/lib/media/mediaRenderers/MediaPdf.php @@ -7,12 +7,12 @@ class MediaPdf implements MediaRendererInterface{ $this->id = $model; } - public function asText(){ + public function asText(array $opt = array()){ return $this->id; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/private/lib/media/mediaRenderers/MediaYoutube.php index 3397a46..72aa514 100644 --- a/private/lib/media/mediaRenderers/MediaYoutube.php +++ b/private/lib/media/mediaRenderers/MediaYoutube.php @@ -7,14 +7,14 @@ class MediaYoutube implements MediaRendererInterface{ $this->link = $link; } - public function asText(){ + public function asText(array $opt = array()){ return ''; } - public function render(){ - echo $this->asText(); + public function render(array $opt = array()){ + echo $this->asText($opt); } } ?> \ No newline at end of file