X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/b365fc709c3a552386ee3c03d26aa7c5a3c285fe..fcb8918f014944caf0dc844989277198ed256915:/Package/PathPackage.php

diff --git a/Package/PathPackage.php b/Package/PathPackage.php
index 4746fe9..c53b10f 100644
--- a/Package/PathPackage.php
+++ b/Package/PathPackage.php
@@ -11,31 +11,30 @@
 
 namespace Rapsys\PackBundle\Package;
 
+use Rapsys\PackBundle\Context\NullContext;
+
 use Symfony\Component\Asset\Context\ContextInterface;
 use Symfony\Component\Asset\Package;
 use Symfony\Component\Asset\VersionStrategy\VersionStrategyInterface;
 
-use Rapsys\PackBundle\Context\NullContext;
-
 /**
  * {@inheritdoc}
  */
 class PathPackage extends Package {
-	//The base path
-	protected $basePath;
-
-	//The base url
-	protected $baseUrl;
+	/**
+	 * The base url
+	 */
+	protected string $baseUrl;
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function __construct(string $basePath, VersionStrategyInterface $versionStrategy, ContextInterface $context = null) {
+	public function __construct(protected string $basePath, protected VersionStrategyInterface $versionStrategy, protected ?ContextInterface $context = null) {
 		//Without context use a null context
-		$context = $context ?? new NullContext();
+		$this->context = $this->context ?? new NullContext();
 
 		//Call parent constructor
-		parent::__construct($versionStrategy, $context);
+		parent::__construct($this->versionStrategy, $this->context);
 
 		//Without base path
 		if (empty($basePath)) {
@@ -54,10 +53,12 @@ class PathPackage extends Package {
 		}
 
 		//Set base url
-		$this->baseUrl = $context->getBaseUrl();
+		$this->baseUrl = $this->context->getBaseUrl();
 	}
 
 	/**
+	 * {@inheritdoc}
+	 *
 	 * Returns an absolute or root-relative public path
 	 *
 	 * Transform @BundleBundle to bundle and remove /Resources/public fragment from path
@@ -66,8 +67,6 @@ class PathPackage extends Package {
 	 * @link https://symfony.com/doc/current/bundles.html#overridding-the-bundle-directory-structure
 	 * @see vendor/symfony/framework-bundle/Command/AssetsInstallCommand.php +113
 	 * @see vendor/symfony/framework-bundle/Command/AssetsInstallCommand.php +141
-	 *
-	 * {@inheritdoc}
 	 */
 	public function getUrl(string $path): string {
 		//Match url starting with a bundle name