Do not access MediaTransformOutput->url directly in Linker

Use the available getUrl(). Also update parameter documentation.

This will allow setting MediaTransformOutput::$url to protected in a
following patch.

Change-Id: I54dfbbc845d1fccd106afc7de1f06fa6e06f6a48

diff --git a/includes/Linker.php b/includes/Linker.php
index 7c6bbc6..cb6129c 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -898,7 +898,7 @@ class Linker {
         * applicable.
         *
         * @param File $file
-        * @param MediaOutput $thumb
+        * @param MediaTransformOutput $thumb
         * @param array $hp image parameters
         */
        public static function processResponsiveImages( $file, $thumb, $hp ) {
@@ -915,11 +915,11 @@ class Linker {
 
                        $thumb15 = $file->transform( $hp15 );
                        $thumb20 = $file->transform( $hp20 );
-                       if ( $thumb15->url !== $thumb->url ) {
-                               $thumb->responsiveUrls['1.5'] = $thumb15->url;
+                       if ( $thumb15->getUrl() !== $thumb->getUrl() ) {
+                               $thumb->responsiveUrls['1.5'] = $thumb15->getUrl();
                        }
-                       if ( $thumb20->url !== $thumb->url ) {
-                               $thumb->responsiveUrls['2'] = $thumb20->url;
+                       if ( $thumb20->getUrl() !== $thumb->getUrl() ) {
+                               $thumb->responsiveUrls['2'] = $thumb20->getUrl();
                        }
                }
        }