Normalized package name

README.md

@@ -24,13 +24,13 @@ Solves the problem of redirecting (overwriting) Symfony application routes from
 composer require piotrpolak/conditional-routing-bundle
 ```
 
-### Enable `PiotrpolakConditionalRoutingBundle` in the application kernel
+### Enable `PiotrPolakConditionalRoutingBundle` in the application kernel
 
 ```php
 // in AppKernel::registerBundles()
 $bundles = array(
  // ...
- new Piotrpolak\ConditionalRoutingBundle\PiotrpolakConditionalRoutingBundle(),
+ new PiotrPolak\ConditionalRoutingBundle\PiotrPolakConditionalRoutingBundle(),
  // ...
 );
 ```
@@ -42,7 +42,7 @@ Including `routing.yml` will enable the `ConditionalRouterLoader`.
 ```yaml
 # in app/config/routing.yml, without those lines ConditionalRouterLoader will not be enabled
 conditional_routing:
- resource: "@PiotrpolakConditionalRoutingBundle/Resources/config/routing.yml"
+ resource: "@PiotrPolakConditionalRoutingBundle/Resources/config/routing.yml"
  type: yaml
 ```
 
@@ -73,7 +73,7 @@ must first be enabled in `AppKernel.php`.
 
 namespace MyApp\Router;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
 
 class TimeCampaignRouteResolver extends AbstractYamlRouteResolver
 {
@@ -116,7 +116,7 @@ Reading the current bundle name from the database.
 namespace MyApp\Router;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
 
 class DatabaseCampaignRouteResolver extends AbstractYamlRouteResolver
 {
@@ -178,9 +178,9 @@ YAML and XML types.
 
 namespace MyApp\Router;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface;
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 

composer.json

@@ -14,7 +14,7 @@
  "license": "MIT",
  "autoload": {
  "psr-4": {
- "Piotrpolak\\ConditionalRoutingBundle\\": "src/"
+ "PiotrPolak\\ConditionalRoutingBundle\\": "src/"
  },
  "exclude-from-classmap": [
  "/src/Tests/"

src/DependencyInjection/Compiler/RouteResolverCompilerPass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\DependencyInjection\Compiler;
+namespace PiotrPolak\ConditionalRoutingBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

src/DependencyInjection/PiotrpolakConditionalRoutingExtension.php → src/DependencyInjection/PiotrPolakConditionalRoutingExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\DependencyInjection;
+namespace PiotrPolak\ConditionalRoutingBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
@@ -12,7 +12,7 @@
  *
  * @author Piotr Polak <piotr@polak.ro>
  */
-class PiotrpolakConditionalRoutingExtension extends Extension
+class PiotrPolakConditionalRoutingExtension extends Extension
 {
  /**
  * {@inheritdoc}

src/Model/AbstractControllerRouteResolver.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition;
 
 /**
  * AbstractXmlRouteResolver provides a way to load routing of controller type easier.

src/Model/AbstractRouteResolver.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
 
 /**
  * AbstractRouteResolver makes usage of RouteResolverInterface easier, any class extending AbstractRouteResolver must

src/Model/AbstractXmlRouteResolver.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
 
 /**
  * AbstractXmlRouteResolver provides a way to load routing of XML type easier.

src/Model/AbstractYamlRouteResolver.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
 
 /**
  * AbstractXmlRouteResolver provides a way to load routing of YAML type easier.

src/Model/RouteResolverInterface.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
 
 /**
  * RouteResolverInterface should be implemented by the component who decides which bundles to be included in routing.

src/Model/RoutingDefinition/AbstractBundleRoutingDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition;
 
 /**
  * AbstractBundleRoutingDefinition makes the usage of BundleRoutingDefinitionInterface easier.

src/Model/RoutingDefinition/BundleRoutingDefinitionInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition;
 
 /**
  * Represents a routing block having a bundle name, type and the resolved resource (path).

src/Model/RoutingDefinition/ControllerBundleRoutingDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition;
 
 /**
  * Represents a routing block of controller type.

src/Model/RoutingDefinition/XmlBundleRoutingDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition;
 
 /**
  * Represents a routing block of XML type.

src/Model/RoutingDefinition/YamlBundleRoutingDefinition.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition;
 
 /**
  * Represents a routing block of YAML type.

src/PiotrpolakConditionalRoutingBundle.php → src/PiotrPolakConditionalRoutingBundle.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle;
+namespace PiotrPolak\ConditionalRoutingBundle;
 
-use Piotrpolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
+use PiotrPolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class PiotrpolakConditionalRoutingBundle extends Bundle
+class PiotrPolakConditionalRoutingBundle extends Bundle
 {
  /**
  * {@inheritdoc}

src/Resources/config/services.yml

@@ -1,8 +1,8 @@
 parameters:
- router.class: Piotrpolak\ConditionalRoutingBundle\Router\ConditionalRouter
+ router.class: PiotrPolak\ConditionalRoutingBundle\Router\ConditionalRouter
 
 services:
  conditional_router.routing_loader:
- class: Piotrpolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader
+ class: PiotrPolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader
  tags:
  - { name: routing.loader }

src/Router/ConditionalRouter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Router;
+namespace PiotrPolak\ConditionalRoutingBundle\Router;
 
 use Symfony\Bundle\FrameworkBundle\Routing\Router as BaseRouter;
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/Router/ConditionalRoutesLoader.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Router;
+namespace PiotrPolak\ConditionalRoutingBundle\Router;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
-use Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface;
+use PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface;
 use Symfony\Component\Config\Loader\Loader;
 use Symfony\Component\Routing\RouteCollection;
 
@@ -33,7 +33,7 @@ public function addRouteResolver(RouteResolverInterface $resolver)
  /**
  * Returns all registered route resolvers.
  *
- * @return \Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface[]
+ * @return \PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface[]
  */
  public function getRouteResolvers()
  {
@@ -43,7 +43,7 @@ public function getRouteResolvers()
  /**
  * Sets route resolvers.
  *
- * @param \Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface[] $routeResolvers
+ * @param \PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface[] $routeResolvers
  * @return $this
  */
  public function setRouteResolvers(array $routeResolvers)

src/Tests/BaseConditionalRoutingBundleTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests;
 
 abstract class BaseConditionalRoutingBundleTestCase extends \PHPUnit_Framework_TestCase
 {

src/Tests/DependencyInjection/Compiler/RouteResolverCompilerPassTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\DependencyInjection\Compiler;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\DependencyInjection\Compiler;
 
-use Piotrpolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
-use Piotrpolak\ConditionalRoutingBundle\Tests\BaseConditionalRoutingBundleTestCase;
+use PiotrPolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
+use PiotrPolak\ConditionalRoutingBundle\Tests\BaseConditionalRoutingBundleTestCase;
 
 class RouteResolverCompilerPassTest extends BaseConditionalRoutingBundleTestCase
 {

src/Tests/DependencyInjection/PiotrpolakConditionalRoutingExtensionTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\DependencyInjection;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\DependencyInjection;
 
-use Piotrpolak\ConditionalRoutingBundle\DependencyInjection\PiotrpolakConditionalRoutingExtension;
-use Piotrpolak\ConditionalRoutingBundle\Tests\BaseConditionalRoutingBundleTestCase;
+use PiotrPolak\ConditionalRoutingBundle\DependencyInjection\PiotrPolakConditionalRoutingExtension;
+use PiotrPolak\ConditionalRoutingBundle\Tests\BaseConditionalRoutingBundleTestCase;
 
-class PiotrpolakConditionalRoutingExtensionTest extends BaseConditionalRoutingBundleTestCase
+class PiotrPolakConditionalRoutingExtensionTest extends BaseConditionalRoutingBundleTestCase
 {
  public function testDefault()
  {
- $extension = new PiotrpolakConditionalRoutingExtension();
+ $extension = new PiotrPolakConditionalRoutingExtension();
  $extension->load(array(), $this->getContainerBuilderMock());
  }
 }

src/Tests/Model/AbstractControllerRouteResolverTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractControllerRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractControllerRouteResolver;
 
 class AbstractControllerRouteResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,7 +13,7 @@ public function testDefault()
 
  $this->assertGreaterThan(0, count($definitions));
  foreach ($definitions as $definition) {
- $this->assertInstanceOf('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition', $definition);
+ $this->assertInstanceOf('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition', $definition);
  }
  }
 }

src/Tests/Model/AbstractRouteResolverTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractRouteResolver;
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
 
 class AbstractRouteResolverTest extends \PHPUnit_Framework_TestCase
 {

src/Tests/Model/AbstractXmlRouteResolverTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractXmlRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractXmlRouteResolver;
 
 class AbstractXmlRouteResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,7 +13,7 @@ public function testDefault()
 
  $this->assertGreaterThan(0, count($definitions));
  foreach ($definitions as $definition) {
- $this->assertInstanceOf('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition', $definition);
+ $this->assertInstanceOf('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition', $definition);
  }
  }
 }

src/Tests/Model/AbstractYamlRouteResolverTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
+use PiotrPolak\ConditionalRoutingBundle\Model\AbstractYamlRouteResolver;
 
 class AbstractYamlRouteResolverTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,7 +13,7 @@ public function testDefault()
 
  $this->assertGreaterThan(0, count($definitions));
  foreach ($definitions as $definition) {
- $this->assertInstanceOf('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition', $definition);
+ $this->assertInstanceOf('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition', $definition);
  }
  }
 }

src/Tests/Model/RoutingDefinition/ControllerBundleRoutingDefinitionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\ControllerBundleRoutingDefinition;
 
 class ControllerBundleRoutingDefinitionTest extends \PHPUnit_Framework_TestCase
 {

src/Tests/Model/RoutingDefinition/XmlBundleRoutingDefinitionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\XmlBundleRoutingDefinition;
 
 class XmlBundleRoutingDefinitionTest extends \PHPUnit_Framework_TestCase
 {

src/Tests/Model/RoutingDefinition/YamlBundleRoutingDefinitionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Model\RoutingDefinition;
 
-use Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
+use PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\YamlBundleRoutingDefinition;
 
 class YamlBundleRoutingDefinitionTest extends \PHPUnit_Framework_TestCase
 {