some fixes

* fixed phpDoc * fixed attr generator * removed attrs from CSS linkin'
odahcam · Sep 24, 2017 · e7577e1 · e7577e1
1 parent 2956062
commit e7577e1
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/Includer.php b/src/Includer.php
@@ -79,26 +79,26 @@ public function cachedAssetUrl($url)
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     public function linkCSS(string $url, $attrs = [])
     {
-        return '<link '.self::arrayToAttr($attrs).' rel="preload" href="'.$this->cachedAssetUrl($url).'" as="style" onload="this.rel=\'stylesheet\'">';
+        return '<link '.self::arrayToAttr($attrs).' rel="preload" href="'.$this->cachedAssetUrl($url).'"\>';
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     public function linkJS(string $url, $attrs = [])
     {
         return '<script '.self::arrayToAttr($attrs).' type="text/javascript" src="'.$this->cachedAssetUrl($url).'"></script>';
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     public function inlineCSS(string $url)
     {
@@ -114,8 +114,8 @@ public function inlineCSS(string $url)
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     public function inlineJS(string $url)
     {
@@ -131,8 +131,8 @@ public function inlineJS(string $url)
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     private function getFilePath(string $url)
     {
@@ -146,8 +146,8 @@ private function getFilePath(string $url)
     }
 
     /**
-     * @param {string} $url
-     * @return {string}
+     * @param string $url
+     * @return string
      */
     private function getFileContents(string $url)
     {
@@ -156,7 +156,7 @@ private function getFileContents(string $url)
     }
 
     /**
-     * @param {array} $attrs
+     * @param array $attrs
      * @return string
      */
     private static function arrayToAttr(array $attrs)
@@ -176,7 +176,7 @@ private static function arrayToAttr(array $attrs)
                     break;
 
                 default:
-                    $attr_string .= $key.'="'.json_encode($value).'"';
+                    $attr_string .= $key.'="'.trim(json_encode($value), '"').'"';
                     break;
 
             }