Permalink
Browse files

Apply naming conventions.

  • Loading branch information...
1 parent b2a650c commit f72c85d64379523823c2d70bb0aacefd3eb2576e Drak committed Apr 15, 2012
Showing with 50 additions and 50 deletions.
  1. +1 −1 src/Zikula/Bundle/ModuleBundle/Controller/DefaultController.php
  2. +3 −3 src/Zikula/Bundle/ModuleBundle/Controller/ModuleController.php
  3. +1 −1 src/Zikula/Bundle/ModuleBundle/DefaultModuleService.php
  4. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/Compiler/ControllerResolverCompilerPass.php
  5. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/Configuration.php
  6. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/ReadOnlyDefinition.php
  7. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/SandboxContainerBuilder.php
  8. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/SandboxContainerExtension.php
  9. +1 −1 src/Zikula/Bundle/ModuleBundle/DependencyInjection/ZikulaModulesExtension.php
  10. +2 −2 src/Zikula/Bundle/ModuleBundle/Entity/Module.php
  11. +1 −1 src/Zikula/Bundle/ModuleBundle/Exception/InvalidModuleStructureException.php
  12. +1 −1 src/Zikula/Bundle/ModuleBundle/Exception/InvalidThemeStructureException.php
  13. +1 −1 src/Zikula/Bundle/ModuleBundle/Form/ModuleType.php
  14. +1 −1 src/Zikula/Bundle/ModuleBundle/ModuleAwareControllerResolver.php
  15. +1 −1 src/Zikula/Bundle/ModuleBundle/ModuleAwareEventDispatcher.php
  16. +1 −1 src/Zikula/Bundle/ModuleBundle/ModuleAwareTraceableEventDispatcher.php
  17. +1 −1 src/Zikula/Bundle/ModuleBundle/ModuleInstallerInterface.php
  18. +3 −3 src/Zikula/Bundle/ModuleBundle/ModuleService/DoctrineStorage.php
  19. +5 −5 src/Zikula/Bundle/ModuleBundle/ModuleService/StorageInterface.php
  20. +1 −1 src/Zikula/Bundle/ModuleBundle/ModuleServiceInterface.php
  21. +6 −6 src/Zikula/Bundle/ModuleBundle/Resources/config/services.xml
  22. +1 −1 src/Zikula/Bundle/ModuleBundle/Tests/Controller/DefaultControllerTest.php
  23. +1 −1 src/Zikula/Bundle/ModuleBundle/Tests/Controller/ModuleControllerTest.php
  24. +2 −2 src/Zikula/Bundle/ModuleBundle/ZikulaKernel.php
  25. +1 −1 src/Zikula/Bundle/ModuleBundle/ZikulaModule.php
  26. +1 −1 src/Zikula/Bundle/ModuleBundle/{ZikulaModulesBundle.php → ZikulaModuleBundle.php}
  27. +1 −1 src/Zikula/Bundle/ModuleBundle/ZikulaModuleRoutesLoader.php
  28. +1 −1 src/Zikula/Bundle/ThemeBundle/Controller/DefaultController.php
  29. +1 −1 src/Zikula/Bundle/ThemeBundle/DependencyInjection/Configuration.php
  30. +1 −1 src/Zikula/Bundle/ThemeBundle/DependencyInjection/ZikulaThemesExtension.php
  31. +1 −1 src/Zikula/Bundle/ThemeBundle/EventListener/ThemeRenderer.php
  32. +1 −1 src/Zikula/Bundle/ThemeBundle/Resources/config/services.xml
  33. +1 −1 src/Zikula/Bundle/ThemeBundle/Tests/Controller/DefaultControllerTest.php
  34. +1 −1 src/Zikula/Bundle/ThemeBundle/ZikulaTheme.php
  35. +1 −1 src/Zikula/Bundle/ThemeBundle/{ZikulaThemesBundle.php → ZikulaThemeBundle.php}
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Controller;
+namespace Zikula\ModuleBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -1,13 +1,13 @@
<?php
-namespace Zikula\ModulesBundle\Controller;
+namespace Zikula\ModuleBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-use Zikula\ModulesBundle\Entity\Module;
-use Zikula\ModulesBundle\Form\ModuleType;
+use Zikula\ModuleBundle\Entity\Module;
+use Zikula\ModuleBundle\Form\ModuleType;
/**
* Module controller.
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Doctrine\ORM\EntityManager;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection\Compiler;
+namespace Zikula\ModuleBundle\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\DependencyInjection;
+namespace Zikula\ModuleBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;
@@ -1,11 +1,11 @@
<?php
-namespace Zikula\ModulesBundle\Entity;
+namespace Zikula\ModuleBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
/**
- * Zikula\ModulesBundle\Entity\Module
+ * Zikula\ModuleBundle\Entity\Module
*
* @ORM\Table()
* @ORM\Entity
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Exception;
+namespace Zikula\ModuleBundle\Exception;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Exception;
+namespace Zikula\ModuleBundle\Exception;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Form;
+namespace Zikula\ModuleBundle\Form;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilder;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\HttpFoundation\Request;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Bundle\FrameworkBundle\Debug\TraceableEventDispatcher;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\ModuleService;
+namespace Zikula\ModuleBundle\ModuleService;
use Doctrine\ORM\EntityManager;
@@ -29,13 +29,13 @@ public function get($id)
return $this->em->find('ZikulaModulesBundle', $id);
}
- public function insert(\Zikula\ModulesBundle\Entity\Module $module)
+ public function insert(\Zikula\ModuleBundle\Entity\Module $module)
{
$this->em->persist($module);
$this->em->flush();
}
- public function update(\Zikula\ModulesBundle\Entity\Module $module)
+ public function update(\Zikula\ModuleBundle\Entity\Module $module)
{
$this->em->persist($module);
$this->em->flush();
@@ -1,24 +1,24 @@
<?php
-namespace Zikula\ModulesBundle\ModuleService;
+namespace Zikula\ModuleBundle\ModuleService;
/**
* Interface of module metadata storages.
*/
interface StorageInterface
{
/**
- * @return \Zikula\ModulesBundle\Entity\Module[]
+ * @return \Zikula\ModuleBundle\Entity\Module[]
*/
public function getAll();
/**
- * @return \Zikula\ModulesBundle\Entity\Module
+ * @return \Zikula\ModuleBundle\Entity\Module
*/
public function get($id);
- public function insert(\Zikula\ModulesBundle\Entity\Module $module);
+ public function insert(\Zikula\ModuleBundle\Entity\Module $module);
- public function update(\Zikula\ModulesBundle\Entity\Module $module);
+ public function update(\Zikula\ModuleBundle\Entity\Module $module);
}
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
/**
* A module service to install, upgrade and remove modules.
@@ -5,26 +5,26 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
- <parameter key="event_dispatcher.class">Zikula\ModulesBundle\ModuleAwareEventDispatcher</parameter>
- <parameter key="debug.event_dispatcher.class">Zikula\ModulesBundle\ModuleAwareTraceableEventDispatcher</parameter>
+ <parameter key="event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareEventDispatcher</parameter>
+ <parameter key="debug.event_dispatcher.class">Zikula\ModuleBundle\ModuleAwareTraceableEventDispatcher</parameter>
</parameters>
<services>
- <service id="zikula_modules.routing.loader" class="Zikula\ModulesBundle\ZikulaModuleRoutesLoader" public="false">
+ <service id="zikula_modules.routing.loader" class="Zikula\ModuleBundle\ZikulaModuleRoutesLoader" public="false">
<tag name="routing.loader" />
<argument type="service" id="kernel" />
</service>
- <service id="zikula.modules.storage" class="Zikula\ModulesBundle\ModuleService\DoctrineStorage" public="false">
+ <service id="zikula.modules.storage" class="Zikula\ModuleBundle\ModuleService\DoctrineStorage" public="false">
<argument type="service" id="doctrine.orm.default_entity_manager" />
</service>
- <service id="zikula.modules" class="Zikula\ModulesBundle\DefaultModuleService">
+ <service id="zikula.modules" class="Zikula\ModuleBundle\DefaultModuleService">
<argument type="service" id="zikula.modules.storage" />
<argument type="service" id="doctrine.orm.default_entity_manager" />
</service>
- <service id="zikula.controller.resolver" class="Zikula\ModulesBundle\ModuleAwareControllerResolver" public="false">
+ <service id="zikula.controller.resolver" class="Zikula\ModuleBundle\ModuleAwareControllerResolver" public="false">
<argument type="service" id="controller_resolver" />
<argument type="service" id="kernel" />
</service>
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Tests\Controller;
+namespace Zikula\ModuleBundle\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle\Tests\Controller;
+namespace Zikula\ModuleBundle\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\ConfigCache;
@@ -131,7 +131,7 @@ private function loadModuleBundlesFromFilesystem()
foreach($dirs as $dir) {
$class = sprintf('%s\\%sModule', $dir->getFilename(), $dir->getFilename());
- if(!is_subclass_of($class, 'Zikula\ModulesBundle\ZikulaModule')) {
+ if(!is_subclass_of($class, 'Zikula\ModuleBundle\ZikulaModule')) {
throw new Exception\InvalidModuleStructureException($dir->getFilename(). ' # '. $class);
}
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ModulesBundle;
+namespace Zikula\ModuleBundle;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle\Controller;
+namespace Zikula\ThemeBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle\DependencyInjection;
+namespace Zikula\ThemeBundle\DependencyInjection;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle\DependencyInjection;
+namespace Zikula\ThemeBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle\EventListener;
+namespace Zikula\ThemeBundle\EventListener;
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
- <service id="zikula.themes.listener" class="Zikula\ThemesBundle\EventListener\ThemeRenderer">
+ <service id="zikula.themes.listener" class="Zikula\ThemeBundle\EventListener\ThemeRenderer">
<tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="255" />
<argument type="service" id="templating" />
</service>
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle\Tests\Controller;
+namespace Zikula\ThemeBundle\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle;
+namespace Zikula\ThemeBundle;
/**
*
@@ -1,6 +1,6 @@
<?php
-namespace Zikula\ThemesBundle;
+namespace Zikula\ThemeBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

0 comments on commit f72c85d

Please sign in to comment.