Skip to content

Commit 59e4260

Browse files
committed
Fixed to follow FXP/composer-asset-plugin API changes
1 parent d34e57b commit 59e4260

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

Diff for: src/console/AssetPackageController.php

-7
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,4 @@ public function actionList()
7676
echo "$name\n";
7777
}
7878
}
79-
80-
public function actionTest()
81-
{
82-
$dir = Yii::getAlias('@storage');
83-
$msg = file_exists($dir) ? 'exists' : 'DOES NOT EXIST';
84-
echo "$dir - $msg\n";
85-
}
8679
}

Diff for: src/console/QueueController.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace hiqdev\assetpackagist\console;
44

55
use hiqdev\assetpackagist\commands\AbstractPackageCommand;
6-
use hiqdev\assetpackagist\repositories\PackageRepository;
76
use Yii;
87
use yii\base\Event;
98
use yii\console\Controller;

Diff for: src/registry/RegistryFactory.php

+15-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111

1212
namespace hiqdev\assetpackagist\registry;
1313

14+
use Composer\IO\NullIO;
1415
use Composer\Repository\RepositoryManager;
16+
use Fxp\Composer\AssetPlugin\Config\Config;
1517
use Fxp\Composer\AssetPlugin\Repository\AbstractAssetsRepository;
18+
use Fxp\Composer\AssetPlugin\Repository\AssetRepositoryManager;
19+
use Fxp\Composer\AssetPlugin\Repository\VcsPackageFilter;
1620

1721
class RegistryFactory
1822
{
@@ -50,12 +54,21 @@ public static function getRegistry($type, $rm)
5054
*/
5155
protected static function buildRegistry($type, $rm)
5256
{
57+
$class = static::$classes[$type];
58+
$rm->setRepositoryClass($type, $class);
59+
5360
$config = [
54-
'repository-manager' => $rm,
61+
'asset-repository-manager' => self::createAssetRepositoryManager($rm),
5562
'asset-options' => [],
5663
];
57-
$rm->setRepositoryClass($type, static::$classes[$type]);
5864

5965
return $rm->createRepository($type, $config);
6066
}
67+
68+
public static function createAssetRepositoryManager($repositoryManager)
69+
{
70+
$filter = (new \ReflectionClass(VcsPackageFilter::class))->newInstanceWithoutConstructor();
71+
72+
return new AssetRepositoryManager(new NullIO(), $repositoryManager, new Config([]), $filter);
73+
}
6174
}

Diff for: src/registry/RegistryTrait.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ public function buildVcsRepository($name)
3636
{
3737
$data = $this->fetchPackageData($name);
3838
$conf = $this->createVcsRepositoryConfig($data, $name);
39+
$conf['asset-repository-manager'] = RegistryFactory::createAssetRepositoryManager($this->repositoryManager);
3940

40-
return $this->rm->createRepository($conf['type'], $conf);
41+
return $this->repositoryManager->createRepository($conf['type'], $conf);
4142
}
4243

4344
public function getPackageSearchUrl($name)

0 commit comments

Comments
 (0)