Laravel 8.x and Php 8.0 Support, fixes (#8)

* Laravel 8 Support, fixes * Revert slash in link * Php 8.0 support * Reverse Blade Directive 'add' * Fix PHP8 Required parameter $type follows optional parameter $assets Co-authored-by: Erik Niebla <[email protected]>
caffeinated · Mar 24, 2021 · 466603f · 466603f
1 parent 423cc86
commit 466603f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -10,8 +10,8 @@
  }
  ],
  "require": {
- "php": "^7.2",
- "illuminate/support": "^6.0|^7.0"
+ "php": "^7.2.5|^8.0",
+ "illuminate/support": "^6.0|^7.0|^8.0|^9.0"
  },
  "autoload": {
  "psr-4": {

diff --git a/src/Assets.php b/src/Assets.php
@@ -7,13 +7,6 @@
 class Assets
 {
 
- /**
- * Regex pattern to match Bonsai json files.
- *
- * @var string
- */
- protected $bonsaiRegex = '/bonsai\.json$/i';
-
  /**
  * @var Illuminate\Support\Collection
  */
@@ -50,10 +43,10 @@ public function add($assets, $namespace = null)
  foreach ($assets as $asset) {
  $this->add($asset, $namespace);
  }
- } elseif ($this->isAsset($assets)) {
- $this->addAsset($assets, $namespace);
  } elseif ($this->isBonsai($assets)) {
  $this->parseBonsai($assets);
+ } elseif ($this->isAsset($assets)) {
+ $this->addAsset($assets, $namespace);
  }
 
  return $this;
@@ -157,7 +150,7 @@ protected function isCss($asset)
  */
  protected function isBonsai($asset)
  {
- return preg_match($this->bonsaiRegex, $asset);
+ return preg_match('/bonsai\.json$/i', $asset);
  }
 
  /**
@@ -225,7 +218,7 @@ protected function parseBonsai($path)
  * @param array $assets
  * @return array
  */
- protected function sortDependencies($assets = array(), $type)
+ protected function sortDependencies($assets = array(), $type = null)
  {
  $dependencyList = array();
 

diff --git a/src/BonsaiServiceProvider.php b/src/BonsaiServiceProvider.php
@@ -25,12 +25,8 @@ public function boot()
  switch($assetType) {
  case "'css'":
  return "<?php echo Bonsai::get()->css(); ?>";
- break;
-
  case "'js'":
- return "<?php echo Bonsai::get()->js(); ?>";
- break;
-
+ return "<?php echo Bonsai::get()->js(); ?>";
  default:
  throw new Exception('Invalid asset type declared. Must be either "css" or "js".');
  }