Make addResource a public method

packaged · Apr 10, 2019 · 2d64070 · 2d64070
1 parent 57de7ae
commit 2d64070
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 21 deletions.
diff --git a/src/ResourceManager.php b/src/ResourceManager.php
@@ -246,13 +246,15 @@ public function isExternalUrl($path)
    * @param string $toRequire filename, or JS if inline manager
    * @param        $options
    *
+   * @param int    $priority
+   *
    * @return ResourceManager
    */
-  public function includeJs($toRequire, $options = null)
+  public function includeJs($toRequire, $options = null, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
     try
     {
-      return $this->requireJs($toRequire, $options);
+      return $this->requireJs($toRequire, $options, $priority);
     }
     catch(Exception $e)
     {
@@ -266,29 +268,33 @@ public function includeJs($toRequire, $options = null)
    * @param string $toRequire filename, or JS if inline manager
    * @param        $options
    *
+   * @param int    $priority
+   *
    * @return ResourceManager
-   * @throws \Exception
+   * @throws Exception
    */
-  public function requireJs($toRequire, $options = null)
+  public function requireJs($toRequire, $options = null, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
     if($this->_type == self::MAP_INLINE)
     {
       return $this->_requireInlineJs($toRequire);
     }
-    Dispatch::instance()->store()->requireJs($this->getResourceUri($toRequire), $options);
+    Dispatch::instance()->store()->requireJs($this->getResourceUri($toRequire), $options, $priority);
     return $this;
   }
 
   /**
    * Add a js script to the store
    *
-   * @param $javascript
+   * @param     $javascript
+   *
+   * @param int $priority
    *
    * @return ResourceManager
    */
-  protected function _requireInlineJs($javascript)
+  protected function _requireInlineJs($javascript, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
-    Dispatch::instance()->store()->requireInlineJs($javascript);
+    Dispatch::instance()->store()->requireInlineJs($javascript, $priority);
     return $this;
   }
 
@@ -298,16 +304,18 @@ protected function _requireInlineJs($javascript)
    * @param string $toRequire filename, or CSS if inline manager
    * @param        $options
    *
+   * @param int    $priority
+   *
    * @return ResourceManager
-   * @throws \Exception
+   * @throws Exception
    */
-  public function requireCss($toRequire, $options = null)
+  public function requireCss($toRequire, $options = null, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
     if($this->_type == self::MAP_INLINE)
     {
       return $this->_requireInlineCss($toRequire);
     }
-    Dispatch::instance()->store()->requireCss($this->getResourceUri($toRequire), $options);
+    Dispatch::instance()->store()->requireCss($this->getResourceUri($toRequire), $options, $priority);
     return $this;
   }
 
@@ -317,13 +325,15 @@ public function requireCss($toRequire, $options = null)
    * @param string $toRequire filename, or CSS if inline manager
    * @param        $options
    *
+   * @param int    $priority
+   *
    * @return ResourceManager
    */
-  public function includeCss($toRequire, $options = null)
+  public function includeCss($toRequire, $options = null, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
     try
     {
-      return $this->requireCss($toRequire, $options);
+      return $this->requireCss($toRequire, $options, $priority);
     }
     catch(Exception $e)
     {
@@ -334,13 +344,15 @@ public function includeCss($toRequire, $options = null)
   /**
    * Add css to the store
    *
-   * @param $stylesheet
+   * @param     $stylesheet
+   *
+   * @param int $priority
    *
    * @return ResourceManager
    */
-  protected function _requireInlineCss($stylesheet)
+  protected function _requireInlineCss($stylesheet, int $priority = ResourceStore::PRIORITY_DEFAULT)
   {
-    Dispatch::instance()->store()->requireInlineCss($stylesheet);
+    Dispatch::instance()->store()->requireInlineCss($stylesheet, $priority);
     return $this;
   }
 }
diff --git a/src/ResourceStore.php b/src/ResourceStore.php
@@ -108,7 +108,7 @@ public function generateHtmlIncludes($for = self::TYPE_CSS)
    * @param     $options
    * @param int $priority
    */
-  protected function _addToStore($type, $uri, $options = null, int $priority = self::PRIORITY_DEFAULT)
+  public function addResource(string $type, string $uri, $options = null, int $priority = self::PRIORITY_DEFAULT)
   {
     if(!empty($uri))
     {
@@ -154,7 +154,7 @@ public function requireJs($filename, $options = null, int $priority = self::PRIO
     $filenames = (array)$filename;
     foreach($filenames as $filename)
     {
-      $this->_addToStore(self::TYPE_JS, $filename, $options, $priority);
+      $this->addResource(self::TYPE_JS, $filename, $options, $priority);
     }
   }
 
@@ -166,7 +166,7 @@ public function requireJs($filename, $options = null, int $priority = self::PRIO
    */
   public function requireInlineJs($javascript, int $priority = self::PRIORITY_DEFAULT)
   {
-    $this->_addToStore(self::TYPE_JS, md5($javascript), $javascript, $priority);
+    $this->addResource(self::TYPE_JS, md5($javascript), $javascript, $priority);
   }
 
   /**
@@ -181,7 +181,7 @@ public function requireCss($filename, $options = null, int $priority = self::PRI
     $filenames = (array)$filename;
     foreach($filenames as $filename)
     {
-      $this->_addToStore(self::TYPE_CSS, $filename, $options, $priority);
+      $this->addResource(self::TYPE_CSS, $filename, $options, $priority);
     }
   }
 
@@ -193,6 +193,6 @@ public function requireCss($filename, $options = null, int $priority = self::PRI
    */
   public function requireInlineCss($stylesheet, int $priority = self::PRIORITY_DEFAULT)
   {
-    $this->_addToStore(self::TYPE_CSS, md5($stylesheet), $stylesheet, $priority);
+    $this->addResource(self::TYPE_CSS, md5($stylesheet), $stylesheet, $priority);
   }
 }