will/KnpGaufretteBundle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change Knplabs to Knp. BC break before Symfony2 release.

Browse Source
This commit is contained in:
Matthieu Bontemps 2011-07-03 11:38:38 +02:00
parent ecac97ce67
commit 6ca918cc26
20 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Command/FilesystemKeysCommand.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\Command; namespace Knp\Bundle\GaufretteBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;

6
DependencyInjection/Compiler/AdapterFactoryManagerPass.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Compiler; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -15,11 +15,11 @@ class AdapterFactoryManagerPass implements CompilerPassInterface
{ {
public function process(ContainerBuilder $container) public function process(ContainerBuilder $container)
{ {
if (!$container->hasDefinition('knplabs_gaufrette.adapter_factory_manager')) { if (!$container->hasDefinition('knp_gaufrette.adapter_factory_manager')) {
return; return;
} }
$definition = $container->getDefinition('knplabs_gaufrette.adapter_factory_manager'); $definition = $container->getDefinition('knp_gaufrette.adapter_factory_manager');
$calls = $definition->getMethodCalls(); $calls = $definition->getMethodCalls();
$definition->setMethodCalls(array()); $definition->setMethodCalls(array());

6
DependencyInjection/Compiler/AdapterManagerPass.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Compiler; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -15,11 +15,11 @@ class AdapterManagerPass implements CompilerPassInterface
{ {
public function process(ContainerBuilder $container) public function process(ContainerBuilder $container)
{ {
if (!$container->hasDefinition('knplabs_gaufrette.adapter_manager')) { if (!$container->hasDefinition('knp_gaufrette.adapter_manager')) {
return; return;
} }
$definition = $container->getDefinition('knplabs_gaufrette.adapter_manager'); $definition = $container->getDefinition('knp_gaufrette.adapter_manager');
$calls = $definition->getMethodCalls(); $calls = $definition->getMethodCalls();
$definition->setMethodCalls(array()); $definition->setMethodCalls(array());

2
DependencyInjection/Factory/AdapterFactoryInterface.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Factory;
use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;

4
DependencyInjection/Factory/InMemoryAdapterFactory.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Factory;
use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -19,7 +19,7 @@ class InMemoryAdapterFactory implements AdapterFactoryInterface
public function create(ContainerBuilder $container, $id, array $config) public function create(ContainerBuilder $container, $id, array $config)
{ {
$container $container
->setDefinition($id, new DefinitionDecorator('knplabs_gaufrette.adapter.in_memory')) ->setDefinition($id, new DefinitionDecorator('knp_gaufrette.adapter.in_memory'))
->replaceArgument(0, $config['files']) ->replaceArgument(0, $config['files'])
; ;
} }

4
DependencyInjection/Factory/LocalAdapterFactory.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Factory;
use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -19,7 +19,7 @@ class LocalAdapterFactory implements AdapterFactoryInterface
public function create(ContainerBuilder $container, $id, array $config) public function create(ContainerBuilder $container, $id, array $config)
{ {
$container $container
->setDefinition($id, new DefinitionDecorator('knplabs_gaufrette.adapter.local')) ->setDefinition($id, new DefinitionDecorator('knp_gaufrette.adapter.local'))
->replaceArgument(0, $config['directory']) ->replaceArgument(0, $config['directory'])
->replaceArgument(1, $config['create']) ->replaceArgument(1, $config['create'])
; ;

4
DependencyInjection/Factory/SafeLocalAdapterFactory.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Factory;
use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
@ -19,7 +19,7 @@ class SafeLocalAdapterFactory implements AdapterFactoryInterface
public function create(ContainerBuilder $container, $id, array $config) public function create(ContainerBuilder $container, $id, array $config)
{ {
$container $container
->setDefinition($id, new DefinitionDecorator('knplabs_gaufrette.adapter.safe_local')) ->setDefinition($id, new DefinitionDecorator('knp_gaufrette.adapter.safe_local'))
->replaceArgument(0, $config['directory']) ->replaceArgument(0, $config['directory'])
->replaceArgument(1, $config['create']) ->replaceArgument(1, $config['create'])
; ;

2
DependencyInjection/Factory/ServiceAdapterFactory.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory; namespace Knp\Bundle\GaufretteBundle\DependencyInjection\Factory;
use Symfony\Component\Config\Definition\Builder\NodeDefinition; use Symfony\Component\Config\Definition\Builder\NodeDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;

4
DependencyInjection/FactoryConfiguration.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection; namespace Knp\Bundle\GaufretteBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface; use Symfony\Component\Config\Definition\ConfigurationInterface;
@ -22,7 +22,7 @@ class FactoryConfiguration implements ConfigurationInterface
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
$treeBuilder $treeBuilder
->root('knplabs_gaufrette') ->root('knp_gaufrette')
->ignoreExtraKeys() ->ignoreExtraKeys()
->fixXmlConfig('factory', 'factories') ->fixXmlConfig('factory', 'factories')
->children() ->children()

8
DependencyInjection/KnplabsGaufretteExtension.php → DependencyInjection/KnpGaufretteExtension.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection; namespace Knp\Bundle\GaufretteBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Processor; use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\FileLocator;
@ -15,7 +15,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
* *
* @author Antoine Hérault <antoine.herault@gmail.com> * @author Antoine Hérault <antoine.herault@gmail.com>
*/ */
class KnplabsGaufretteExtension extends Extension class KnpGaufretteExtension extends Extension
{ {
private $factories = null; private $factories = null;
@ -50,7 +50,7 @@ class KnplabsGaufretteExtension extends Extension
$map[$name] = $this->createFilesystem($name, $filesystem, $container, $adapters); $map[$name] = $this->createFilesystem($name, $filesystem, $container, $adapters);
} }
$container->getDefinition('knplabs_gaufrette.filesystem_map') $container->getDefinition('knp_gaufrette.filesystem_map')
->replaceArgument(0, $map); ->replaceArgument(0, $map);
} }
@ -82,7 +82,7 @@ class KnplabsGaufretteExtension extends Extension
$id = sprintf('gaufrette.%s_filesystem', $name); $id = sprintf('gaufrette.%s_filesystem', $name);
$container $container
->setDefinition($id, new DefinitionDecorator('knplabs_gaufrette.filesystem')) ->setDefinition($id, new DefinitionDecorator('knp_gaufrette.filesystem'))
->replaceArgument(0, new Reference($adapter)) ->replaceArgument(0, new Reference($adapter))
; ;

4
DependencyInjection/MainConfiguration.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\DependencyInjection; namespace Knp\Bundle\GaufretteBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@ -33,7 +33,7 @@ class MainConfiguration implements ConfigurationInterface
public function getConfigTreeBuilder() public function getConfigTreeBuilder()
{ {
$treeBuilder = new TreeBuilder(); $treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('knplabs_gaufrette'); $rootNode = $treeBuilder->root('knp_gaufrette');
$this->addAdaptersSection($rootNode, $this->factories); $this->addAdaptersSection($rootNode, $this->factories);
$this->addFilesystemsSection($rootNode); $this->addFilesystemsSection($rootNode);

2
FilesystemMap.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle; namespace Knp\Bundle\GaufretteBundle;
/** /**
* Holds references to all declared filesystems * Holds references to all declared filesystems

4
KnplabsGaufretteBundle.php → KnpGaufretteBundle.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle; namespace Knp\Bundle\GaufretteBundle;
use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle; use Symfony\Component\HttpKernel\Bundle\Bundle;
@ -10,6 +10,6 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
* *
* @author Antoine Hérault <antoine.herault@gmail.com> * @author Antoine Hérault <antoine.herault@gmail.com>
*/ */
class KnplabsGaufretteBundle extends Bundle class KnpGaufretteBundle extends Bundle
{ {
} }

24
README.markdown
View File

@ -20,15 +20,15 @@ As this bundle is an integration for Symfony of the [Gaufrette][gaufrette-homepa
## Download the bundle ## Download the bundle
You can download an archive of the bundle and unpack it in the `vendor/bundles/Knplabs/Bundle/GaufretteBundle` directory of your application. You can download an archive of the bundle and unpack it in the `vendor/bundles/Knp/Bundle/GaufretteBundle` directory of your application.
If you are versioning your project with git, you had better to embed it as a submodule: If you are versioning your project with git, you had better to embed it as a submodule:
$ git submodule add https://github.com/knplabs/GaufretteBundle.git vendor/bundles/Knplabs/Bundle/GaufretteBundle $ git submodule add https://github.com/knplabs/KnpGaufretteBundle.git vendor/bundles/Knp/Bundle/GaufretteBundle
## Add the namespace in the autoloader ## Add the namespace in the autoloader
If the `Knplabs` namespace is not already defined in your autoloader, you must add it: If the `Knp` namespace is not already defined in your autoloader, you must add it:
``` php ``` php
<?php <?php
@ -37,7 +37,7 @@ If the `Knplabs` namespace is not already defined in your autoloader, you must a
$loader->registerNamespaces(array( $loader->registerNamespaces(array(
'Knplabs\Bundle' => __DIR__.'/../vendor/bundles' 'Knp\Bundle' => __DIR__.'/../vendor/bundles'
// ... // ...
@ -59,7 +59,7 @@ public function registerBundles()
// ... // ...
new Knplabs\Bundle\GaufretteBundle\KnplabsGaufretteBundle() new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle()
); );
// ... // ...
@ -78,7 +78,7 @@ The configuration of the Gaufrette bundle is divided into two parts: the `adapte
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
local: local:
@ -91,7 +91,7 @@ The defined adapters are usable to create the filesystems.
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
# ... # ...
filesystems: filesystems:
@ -111,7 +111,7 @@ You can access to all declared filesystems through the map service.
In the previous exemple, we declared a `bar` filesystem: In the previous exemple, we declared a `bar` filesystem:
``` php ``` php
$container->get('knplabs_gaufrette.filesystem_map')->get('bar'); $container->get('knp_gaufrette.filesystem_map')->get('bar');
``` ```
Returns the instance of `Gaufrette\Filesystem` for `bar`. Returns the instance of `Gaufrette\Filesystem` for `bar`.
@ -132,7 +132,7 @@ A simple local filesystem based adapter.
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
local: local:
@ -153,7 +153,7 @@ Almost as simple as the **local** adapter, but it encodes key to avoid having to
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
safe_local: safe_local:
@ -173,7 +173,7 @@ Allows you to use a user defined adapter service.
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
service: service:
@ -194,7 +194,7 @@ The `files` is an array of files where each file is a sub-array having the `cont
``` yaml ``` yaml
# app/config/config.yml # app/config/config.yml
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
in_memory: in_memory:

8
Resources/config/adapter_factories.xml
View File

@ -5,16 +5,16 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services> <services>
<service id="knplabs_gaufrette.adapter.factory.in_memory" class="Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory\InMemoryAdapterFactory"> <service id="knp_gaufrette.adapter.factory.in_memory" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\InMemoryAdapterFactory">
<tag name="gaufrette.adapter.factory" /> <tag name="gaufrette.adapter.factory" />
</service> </service>
<service id="knplabs_gaufrette.adapter.factory.service" class="Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory\ServiceAdapterFactory"> <service id="knp_gaufrette.adapter.factory.service" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\ServiceAdapterFactory">
<tag name="gaufrette.adapter.factory" /> <tag name="gaufrette.adapter.factory" />
</service> </service>
<service id="knplabs_gaufrette.adapter.factory.local" class="Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory\LocalAdapterFactory"> <service id="knp_gaufrette.adapter.factory.local" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\LocalAdapterFactory">
<tag name="gaufrette.adapter.factory" /> <tag name="gaufrette.adapter.factory" />
</service> </service>
<service id="knplabs_gaufrette.adapter.factory.safe_local" class="Knplabs\Bundle\GaufretteBundle\DependencyInjection\Factory\SafeLocalAdapterFactory"> <service id="knp_gaufrette.adapter.factory.safe_local" class="Knp\Bundle\GaufretteBundle\DependencyInjection\Factory\SafeLocalAdapterFactory">
<tag name="gaufrette.adapter.factory" /> <tag name="gaufrette.adapter.factory" />
</service> </service>
</services> </services>

10
Resources/config/gaufrette.xml
View File

@ -5,21 +5,21 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services> <services>
<service id="knplabs_gaufrette.filesystem" class="Gaufrette\Filesystem" abstract="true"> <service id="knp_gaufrette.filesystem" class="Gaufrette\Filesystem" abstract="true">
<argument /><!-- The Adapter --> <argument /><!-- The Adapter -->
</service> </service>
<service id="knplabs_gaufrette.adapter.in_memory" class="Gaufrette\Adapter\InMemory" abstract="true" public="false"> <service id="knp_gaufrette.adapter.in_memory" class="Gaufrette\Adapter\InMemory" abstract="true" public="false">
<argument /><!-- Files --> <argument /><!-- Files -->
</service> </service>
<service id="knplabs_gaufrette.adapter.local" class="Gaufrette\Adapter\Local" abstract="true" public="false"> <service id="knp_gaufrette.adapter.local" class="Gaufrette\Adapter\Local" abstract="true" public="false">
<argument /><!-- Directory --> <argument /><!-- Directory -->
<argument /><!-- Create --> <argument /><!-- Create -->
</service> </service>
<service id="knplabs_gaufrette.adapter.safe_local" class="Gaufrette\Adapter\SafeLocal" abstract="true" public="false"> <service id="knp_gaufrette.adapter.safe_local" class="Gaufrette\Adapter\SafeLocal" abstract="true" public="false">
<argument /><!-- Directory --> <argument /><!-- Directory -->
<argument /><!-- Create --> <argument /><!-- Create -->
</service> </service>
<service id="knplabs_gaufrette.filesystem_map" class="Knplabs\Bundle\GaufretteBundle\FilesystemMap"> <service id="knp_gaufrette.filesystem_map" class="Knp\Bundle\GaufretteBundle\FilesystemMap">
<argument /> <!-- map of filesystems --> <argument /> <!-- map of filesystems -->
</service> </service>
</services> </services>

2
Tests/FunctionalTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\Tests; namespace Knp\Bundle\GaufretteBundle\Tests;
use Symfony\Component\HttpKernel\Util\Filesystem; use Symfony\Component\HttpKernel\Util\Filesystem;

2
Tests/Resources/config/config.yml
View File

@ -1,4 +1,4 @@
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
local: local:

2
Tests/Resources/config/config_test.yml
View File

@ -1,7 +1,7 @@
imports: imports:
- { resource: config.yml } - { resource: config.yml }
knplabs_gaufrette: knp_gaufrette:
adapters: adapters:
foo: foo:
in_memory: ~ in_memory: ~

4
Tests/TestKernel.php
View File

@ -1,6 +1,6 @@
<?php <?php
namespace Knplabs\Bundle\GaufretteBundle\Tests; namespace Knp\Bundle\GaufretteBundle\Tests;
use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\HttpKernel\Kernel;
@ -15,7 +15,7 @@ class TestKernel extends Kernel
public function registerBundles() public function registerBundles()
{ {
return array( return array(
new \Knplabs\Bundle\GaufretteBundle\KnplabsGaufretteBundle(), new \Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(),
); );
} }