Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 154d4e0

Browse files
committed
Use vendor prefixes in type names
/fixes #24
1 parent 6ffadeb commit 154d4e0

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

src/CmfResourceBundle.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\HttpKernel\Bundle\Bundle;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\FilesystemFactory;
17-
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\DoctrinePhpcrFactory;
17+
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\PhpcrFactory;
1818
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\DoctrinePhpcrOdmFactory;
1919
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Compiler\DescriptionEnhancerPass;
2020

@@ -24,8 +24,8 @@ public function build(ContainerBuilder $container)
2424
{
2525
$extension = $container->getExtension('cmf_resource');
2626
//$extension->addRepositoryFactory('filesystem', new FilesystemFactory());
27-
$extension->addRepositoryFactory('doctrine_phpcr', new DoctrinePhpcrFactory());
28-
$extension->addRepositoryFactory('doctrine_phpcr_odm', new DoctrinePhpcrOdmFactory());
27+
$extension->addRepositoryFactory('phpcr/phpcr', new PhpcrFactory());
28+
$extension->addRepositoryFactory('doctrine/phpcr-odm', new DoctrinePhpcrOdmFactory());
2929

3030
$container->addCompilerPass(new DescriptionEnhancerPass());
3131

src/DependencyInjection/Repository/Factory/DoctrinePhpcrOdmFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function create(array $options)
3434
*/
3535
public function getName()
3636
{
37-
return 'doctrine_phpcr_odm';
37+
return 'doctrine/phpcr-odm';
3838
}
3939

4040
/**

src/DependencyInjection/Repository/Factory/FilesystemFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function create(array $options)
3333
*/
3434
public function getName()
3535
{
36-
return 'filesystem';
36+
return 'puli/filesystem';
3737
}
3838

3939
/**

src/DependencyInjection/Repository/Factory/DoctrinePhpcrFactory.php renamed to src/DependencyInjection/Repository/Factory/PhpcrFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\DependencyInjection\Definition;
1717
use Symfony\Cmf\Component\Resource\Repository\PhpcrRepository;
1818

19-
class DoctrinePhpcrFactory implements RepositoryFactoryInterface
19+
class PhpcrFactory implements RepositoryFactoryInterface
2020
{
2121
/**
2222
* {@inheritdoc}
@@ -34,7 +34,7 @@ public function create(array $options)
3434
*/
3535
public function getName()
3636
{
37-
return 'doctrine_phpcr';
37+
return 'phpcr/phpcr';
3838
}
3939

4040
/**

tests/Resources/app/config/resource.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
cmf_resource:
22
repositories:
33
test_repository_phpcr_odm:
4-
type: doctrine_phpcr_odm
4+
type: doctrine/phpcr-odm
55
basepath: /test
66

77
test_repository_phpcr:
8-
type: doctrine_phpcr
8+
type: phpcr/phpcr
99
basepath: /test
1010

1111
articles:
12-
type: doctrine_phpcr_odm
12+
type: doctrine/phpcr-odm
1313
basepath: /cmf/articles
1414

1515
# my_filesystem:

tests/Unit/DependencyInjection/Repository/Factory/DoctrinePhpcrFactoryTest.php renamed to tests/Unit/DependencyInjection/Repository/Factory/PhpcrFactoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceBundle\Tests\Unit\DependencyInjection\Repository\Factory;
1313

14-
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\DoctrinePhpcrFactory;
14+
use Symfony\Cmf\Bundle\ResourceBundle\DependencyInjection\Repository\Factory\PhpcrFactory;
1515
use PHPCR\SessionInterface;
1616
use Symfony\Cmf\Component\Resource\Repository\PhpcrRepository;
1717
use PHPCR\NodeInterface;
1818

19-
class DoctrinePhpcrFactoryTest extends FactoryTestCase
19+
class PhpcrFactoryTest extends FactoryTestCase
2020
{
2121
private $session;
2222

@@ -62,6 +62,6 @@ public function testBasepath()
6262

6363
protected function getFactory()
6464
{
65-
return new DoctrinePhpcrFactory();
65+
return new PhpcrFactory();
6666
}
6767
}

0 commit comments

Comments
 (0)