Merge pull request #4422 from dennisbirkholz/wildcard-repositories
Enable wildcards in path names for path repositoriespull/4431/head
commit
8f44f9cc67
|
@ -639,6 +639,9 @@ file, you can use the following configuration:
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> **Note:** Repository paths can also contain wildcards like ``*`` and ``?``.
|
||||||
|
> For details, see the [PHP glob function](http://php.net/glob).
|
||||||
|
|
||||||
## Disabling Packagist
|
## Disabling Packagist
|
||||||
|
|
||||||
You can disable the default Packagist repository by adding this to your
|
You can disable the default Packagist repository by adding this to your
|
||||||
|
|
|
@ -38,6 +38,10 @@ use Composer\Util\ProcessExecutor;
|
||||||
* {
|
* {
|
||||||
* "type": "path",
|
* "type": "path",
|
||||||
* "url": "/absolute/path/to/package/"
|
* "url": "/absolute/path/to/package/"
|
||||||
|
* },
|
||||||
|
* {
|
||||||
|
* "type": "path",
|
||||||
|
* "url": "/absolute/path/to/several/packages/*"
|
||||||
* }
|
* }
|
||||||
* ]
|
* ]
|
||||||
* @endcode
|
* @endcode
|
||||||
|
@ -97,17 +101,19 @@ class PathRepository extends ArrayRepository
|
||||||
{
|
{
|
||||||
parent::initialize();
|
parent::initialize();
|
||||||
|
|
||||||
$path = $this->getPath();
|
foreach ($this->getPaths() as $path) {
|
||||||
|
$path = realpath($path) . '/';
|
||||||
|
|
||||||
$composerFilePath = $path.'composer.json';
|
$composerFilePath = $path.'composer.json';
|
||||||
if (!file_exists($composerFilePath)) {
|
if (!file_exists($composerFilePath)) {
|
||||||
throw new \RuntimeException(sprintf('No `composer.json` file found in path repository "%s"', $path));
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$json = file_get_contents($composerFilePath);
|
$json = file_get_contents($composerFilePath);
|
||||||
$package = JsonFile::parseJson($json, $composerFilePath);
|
$package = JsonFile::parseJson($json, $composerFilePath);
|
||||||
$package['dist'] = array(
|
$package['dist'] = array(
|
||||||
'type' => 'path',
|
'type' => 'path',
|
||||||
'url' => $this->url,
|
'url' => $path,
|
||||||
'reference' => '',
|
'reference' => '',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -122,11 +128,18 @@ class PathRepository extends ArrayRepository
|
||||||
$this->addPackage($package);
|
$this->addPackage($package);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (count($this->getPackages()) == 0) {
|
||||||
|
throw new \RuntimeException(sprintf('No `composer.json` file found in any path repository in "%s"', $this->url));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* Get a list of all path names matching given url (supports globbing).
|
||||||
|
*
|
||||||
|
* @return string[]
|
||||||
*/
|
*/
|
||||||
private function getPath()
|
private function getPaths()
|
||||||
{
|
{
|
||||||
return realpath(rtrim($this->url, '/')) . '/';
|
return glob($this->url, GLOB_MARK|GLOB_ONLYDIR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"name": "test/path",
|
"name": "test/path-versioned",
|
||||||
"version": "0.0.2"
|
"version": "0.0.2"
|
||||||
}
|
}
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
"name": "test/path"
|
"name": "test/path-unversioned"
|
||||||
}
|
}
|
|
@ -35,7 +35,7 @@ class PathRepositoryTest extends TestCase
|
||||||
$repository->getPackages();
|
$repository->getPackages();
|
||||||
|
|
||||||
$this->assertEquals(1, $repository->count());
|
$this->assertEquals(1, $repository->count());
|
||||||
$this->assertTrue($repository->hasPackage($this->getPackage('test/path', '0.0.2')));
|
$this->assertTrue($repository->hasPackage($this->getPackage('test/path-versioned', '0.0.2')));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testLoadPackageFromFileSystemWithoutVersion()
|
public function testLoadPackageFromFileSystemWithoutVersion()
|
||||||
|
@ -54,9 +54,31 @@ class PathRepositoryTest extends TestCase
|
||||||
$this->assertEquals(1, $repository->count());
|
$this->assertEquals(1, $repository->count());
|
||||||
|
|
||||||
$package = $packages[0];
|
$package = $packages[0];
|
||||||
$this->assertEquals('test/path', $package->getName());
|
$this->assertEquals('test/path-unversioned', $package->getName());
|
||||||
|
|
||||||
$packageVersion = $package->getVersion();
|
$packageVersion = $package->getVersion();
|
||||||
$this->assertTrue(!empty($packageVersion));
|
$this->assertTrue(!empty($packageVersion));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testLoadPackageFromFileSystemWithWildcard()
|
||||||
|
{
|
||||||
|
$ioInterface = $this->getMockBuilder('Composer\IO\IOInterface')
|
||||||
|
->getMock();
|
||||||
|
|
||||||
|
$config = new \Composer\Config();
|
||||||
|
$loader = new ArrayLoader(new VersionParser());
|
||||||
|
$versionGuesser = null;
|
||||||
|
|
||||||
|
$repositoryUrl = implode(DIRECTORY_SEPARATOR, array(__DIR__, 'Fixtures', 'path', '*'));
|
||||||
|
$repository = new PathRepository(array('url' => $repositoryUrl), $ioInterface, $config, $loader);
|
||||||
|
$packages = $repository->getPackages();
|
||||||
|
|
||||||
|
$this->assertEquals(2, $repository->count());
|
||||||
|
|
||||||
|
$package = $packages[0];
|
||||||
|
$this->assertEquals('test/path-versioned', $package->getName());
|
||||||
|
|
||||||
|
$package = $packages[1];
|
||||||
|
$this->assertEquals('test/path-unversioned', $package->getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue