From be568ee174cc381d533aaa0139366e3473b38d1a Mon Sep 17 00:00:00 2001
From: Piotr Polak <piotr@polak.ro>
Date: Thu, 25 Oct 2018 18:00:05 +0200
Subject: [PATCH] Normalized package name

---
 README.md                                        | 16 ++++++++--------
 composer.json                                    |  2 +-
 .../Compiler/RouteResolverCompilerPass.php       |  2 +-
 ...=> PiotrPolakConditionalRoutingExtension.php} |  4 ++--
 src/Model/AbstractControllerRouteResolver.php    |  4 ++--
 src/Model/AbstractRouteResolver.php              |  4 ++--
 src/Model/AbstractXmlRouteResolver.php           |  4 ++--
 src/Model/AbstractYamlRouteResolver.php          |  4 ++--
 src/Model/RouteResolverInterface.php             |  4 ++--
 .../AbstractBundleRoutingDefinition.php          |  2 +-
 .../BundleRoutingDefinitionInterface.php         |  2 +-
 .../ControllerBundleRoutingDefinition.php        |  2 +-
 .../XmlBundleRoutingDefinition.php               |  2 +-
 .../YamlBundleRoutingDefinition.php              |  2 +-
 ...hp => PiotrPolakConditionalRoutingBundle.php} |  6 +++---
 src/Resources/config/services.yml                |  4 ++--
 src/Router/ConditionalRouter.php                 |  2 +-
 src/Router/ConditionalRoutesLoader.php           | 10 +++++-----
 .../BaseConditionalRoutingBundleTestCase.php     |  2 +-
 .../Compiler/RouteResolverCompilerPassTest.php   |  6 +++---
 ...PiotrpolakConditionalRoutingExtensionTest.php | 10 +++++-----
 .../AbstractControllerRouteResolverTest.php      |  6 +++---
 src/Tests/Model/AbstractRouteResolverTest.php    |  6 +++---
 src/Tests/Model/AbstractXmlRouteResolverTest.php |  6 +++---
 .../Model/AbstractYamlRouteResolverTest.php      |  6 +++---
 .../ControllerBundleRoutingDefinitionTest.php    |  4 ++--
 .../XmlBundleRoutingDefinitionTest.php           |  4 ++--
 .../YamlBundleRoutingDefinitionTest.php          |  4 ++--
 .../PiotrpolakConditionalRoutingBundleTest.php   | 10 +++++-----
 src/Tests/Router/ConditionalRouterTest.php       |  6 +++---
 src/Tests/Router/ConditionalRoutesLoaderTest.php | 14 +++++++-------
 31 files changed, 80 insertions(+), 80 deletions(-)
 rename src/DependencyInjection/{PiotrpolakConditionalRoutingExtension.php => PiotrPolakConditionalRoutingExtension.php} (82%)
 rename src/{PiotrpolakConditionalRoutingBundle.php => PiotrPolakConditionalRoutingBundle.php} (66%)

diff --git a/README.md b/README.md
index d1c7ce9..76eda1f 100644
--- a/README.md
+++ b/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;
 
diff --git a/composer.json b/composer.json
index 3384fdd..b095d0e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "Piotrpolak\\ConditionalRoutingBundle\\": "src/"
+            "PiotrPolak\\ConditionalRoutingBundle\\": "src/"
         },
         "exclude-from-classmap": [
             "/src/Tests/"
diff --git a/src/DependencyInjection/Compiler/RouteResolverCompilerPass.php b/src/DependencyInjection/Compiler/RouteResolverCompilerPass.php
index d51ae5f..10349bc 100644
--- a/src/DependencyInjection/Compiler/RouteResolverCompilerPass.php
+++ b/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;
diff --git a/src/DependencyInjection/PiotrpolakConditionalRoutingExtension.php b/src/DependencyInjection/PiotrPolakConditionalRoutingExtension.php
similarity index 82%
rename from src/DependencyInjection/PiotrpolakConditionalRoutingExtension.php
rename to src/DependencyInjection/PiotrPolakConditionalRoutingExtension.php
index d119a79..03531e6 100644
--- a/src/DependencyInjection/PiotrpolakConditionalRoutingExtension.php
+++ b/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}
diff --git a/src/Model/AbstractControllerRouteResolver.php b/src/Model/AbstractControllerRouteResolver.php
index a8e44e5..2f3f355 100644
--- a/src/Model/AbstractControllerRouteResolver.php
+++ b/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.
diff --git a/src/Model/AbstractRouteResolver.php b/src/Model/AbstractRouteResolver.php
index a7aa02d..6b7d6bc 100644
--- a/src/Model/AbstractRouteResolver.php
+++ b/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
diff --git a/src/Model/AbstractXmlRouteResolver.php b/src/Model/AbstractXmlRouteResolver.php
index e5ad342..a2a8b56 100644
--- a/src/Model/AbstractXmlRouteResolver.php
+++ b/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.
diff --git a/src/Model/AbstractYamlRouteResolver.php b/src/Model/AbstractYamlRouteResolver.php
index 8c818eb..6d19249 100644
--- a/src/Model/AbstractYamlRouteResolver.php
+++ b/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.
diff --git a/src/Model/RouteResolverInterface.php b/src/Model/RouteResolverInterface.php
index a20d539..533f93b 100644
--- a/src/Model/RouteResolverInterface.php
+++ b/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.
diff --git a/src/Model/RoutingDefinition/AbstractBundleRoutingDefinition.php b/src/Model/RoutingDefinition/AbstractBundleRoutingDefinition.php
index 16cb0dd..4772712 100644
--- a/src/Model/RoutingDefinition/AbstractBundleRoutingDefinition.php
+++ b/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.
diff --git a/src/Model/RoutingDefinition/BundleRoutingDefinitionInterface.php b/src/Model/RoutingDefinition/BundleRoutingDefinitionInterface.php
index b6bcc0f..f6e3d19 100644
--- a/src/Model/RoutingDefinition/BundleRoutingDefinitionInterface.php
+++ b/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).
diff --git a/src/Model/RoutingDefinition/ControllerBundleRoutingDefinition.php b/src/Model/RoutingDefinition/ControllerBundleRoutingDefinition.php
index 66644b9..d9502e6 100644
--- a/src/Model/RoutingDefinition/ControllerBundleRoutingDefinition.php
+++ b/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.
diff --git a/src/Model/RoutingDefinition/XmlBundleRoutingDefinition.php b/src/Model/RoutingDefinition/XmlBundleRoutingDefinition.php
index f415bbc..0473790 100644
--- a/src/Model/RoutingDefinition/XmlBundleRoutingDefinition.php
+++ b/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.
diff --git a/src/Model/RoutingDefinition/YamlBundleRoutingDefinition.php b/src/Model/RoutingDefinition/YamlBundleRoutingDefinition.php
index 7004454..4df3b52 100644
--- a/src/Model/RoutingDefinition/YamlBundleRoutingDefinition.php
+++ b/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.
diff --git a/src/PiotrpolakConditionalRoutingBundle.php b/src/PiotrPolakConditionalRoutingBundle.php
similarity index 66%
rename from src/PiotrpolakConditionalRoutingBundle.php
rename to src/PiotrPolakConditionalRoutingBundle.php
index 07ce948..079c32e 100644
--- a/src/PiotrpolakConditionalRoutingBundle.php
+++ b/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}
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
index a5550d8..5df4715 100644
--- a/src/Resources/config/services.yml
+++ b/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 }
diff --git a/src/Router/ConditionalRouter.php b/src/Router/ConditionalRouter.php
index dfe72d2..6d9a1bb 100644
--- a/src/Router/ConditionalRouter.php
+++ b/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;
diff --git a/src/Router/ConditionalRoutesLoader.php b/src/Router/ConditionalRoutesLoader.php
index 9530cd5..cfa924e 100644
--- a/src/Router/ConditionalRoutesLoader.php
+++ b/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)
diff --git a/src/Tests/BaseConditionalRoutingBundleTestCase.php b/src/Tests/BaseConditionalRoutingBundleTestCase.php
index a878f13..644cf6d 100644
--- a/src/Tests/BaseConditionalRoutingBundleTestCase.php
+++ b/src/Tests/BaseConditionalRoutingBundleTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests;
 
 abstract class BaseConditionalRoutingBundleTestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Tests/DependencyInjection/Compiler/RouteResolverCompilerPassTest.php b/src/Tests/DependencyInjection/Compiler/RouteResolverCompilerPassTest.php
index 23bba3b..c1465ae 100644
--- a/src/Tests/DependencyInjection/Compiler/RouteResolverCompilerPassTest.php
+++ b/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
 {
diff --git a/src/Tests/DependencyInjection/PiotrpolakConditionalRoutingExtensionTest.php b/src/Tests/DependencyInjection/PiotrpolakConditionalRoutingExtensionTest.php
index 4760c50..fc089c2 100644
--- a/src/Tests/DependencyInjection/PiotrpolakConditionalRoutingExtensionTest.php
+++ b/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());
     }
 }
diff --git a/src/Tests/Model/AbstractControllerRouteResolverTest.php b/src/Tests/Model/AbstractControllerRouteResolverTest.php
index 8846212..6fff1da 100644
--- a/src/Tests/Model/AbstractControllerRouteResolverTest.php
+++ b/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);
         }
     }
 }
diff --git a/src/Tests/Model/AbstractRouteResolverTest.php b/src/Tests/Model/AbstractRouteResolverTest.php
index 8a06aab..0055fd8 100644
--- a/src/Tests/Model/AbstractRouteResolverTest.php
+++ b/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
 {
diff --git a/src/Tests/Model/AbstractXmlRouteResolverTest.php b/src/Tests/Model/AbstractXmlRouteResolverTest.php
index 11ee910..5b209fb 100644
--- a/src/Tests/Model/AbstractXmlRouteResolverTest.php
+++ b/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);
         }
     }
 }
diff --git a/src/Tests/Model/AbstractYamlRouteResolverTest.php b/src/Tests/Model/AbstractYamlRouteResolverTest.php
index 63ec72e..c68a081 100644
--- a/src/Tests/Model/AbstractYamlRouteResolverTest.php
+++ b/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);
         }
     }
 }
diff --git a/src/Tests/Model/RoutingDefinition/ControllerBundleRoutingDefinitionTest.php b/src/Tests/Model/RoutingDefinition/ControllerBundleRoutingDefinitionTest.php
index 09ffad2..e9ae2d8 100644
--- a/src/Tests/Model/RoutingDefinition/ControllerBundleRoutingDefinitionTest.php
+++ b/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
 {
diff --git a/src/Tests/Model/RoutingDefinition/XmlBundleRoutingDefinitionTest.php b/src/Tests/Model/RoutingDefinition/XmlBundleRoutingDefinitionTest.php
index d39c9c7..7824adb 100644
--- a/src/Tests/Model/RoutingDefinition/XmlBundleRoutingDefinitionTest.php
+++ b/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
 {
diff --git a/src/Tests/Model/RoutingDefinition/YamlBundleRoutingDefinitionTest.php b/src/Tests/Model/RoutingDefinition/YamlBundleRoutingDefinitionTest.php
index 58d421d..71f5596 100644
--- a/src/Tests/Model/RoutingDefinition/YamlBundleRoutingDefinitionTest.php
+++ b/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
 {
diff --git a/src/Tests/PiotrpolakConditionalRoutingBundleTest.php b/src/Tests/PiotrpolakConditionalRoutingBundleTest.php
index 9a70cdd..1a0ab82 100644
--- a/src/Tests/PiotrpolakConditionalRoutingBundleTest.php
+++ b/src/Tests/PiotrpolakConditionalRoutingBundleTest.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests;
 
-use Piotrpolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
-use Piotrpolak\ConditionalRoutingBundle\PiotrpolakConditionalRoutingBundle;
+use PiotrPolak\ConditionalRoutingBundle\DependencyInjection\Compiler\RouteResolverCompilerPass;
+use PiotrPolak\ConditionalRoutingBundle\PiotrPolakConditionalRoutingBundle;
 
-class PiotrpolakConditionalRoutingBundleTest extends BaseConditionalRoutingBundleTestCase
+class PiotrPolakConditionalRoutingBundleTest extends BaseConditionalRoutingBundleTestCase
 {
     public function testDefault()
     {
         $containerBuilder = $this->getContainerBuilderMock();
         $containerBuilder->expects($this->once())->method('addCompilerPass')->with(new RouteResolverCompilerPass());
 
-        $bundle = new PiotrpolakConditionalRoutingBundle();
+        $bundle = new PiotrPolakConditionalRoutingBundle();
         $bundle->build($containerBuilder);
     }
 }
diff --git a/src/Tests/Router/ConditionalRouterTest.php b/src/Tests/Router/ConditionalRouterTest.php
index a096add..f5d0a83 100644
--- a/src/Tests/Router/ConditionalRouterTest.php
+++ b/src/Tests/Router/ConditionalRouterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Router;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Router;
 
-use Piotrpolak\ConditionalRoutingBundle\Router\ConditionalRouter;
+use PiotrPolak\ConditionalRoutingBundle\Router\ConditionalRouter;
 
 class ConditionalRouterTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +25,7 @@ public function testOptionsNotOverwriteWrongLoader()
     public function testOptionsOverwrite()
     {
         $suffix = '__NamespaceConditionalSampleBundle';
-        $loader = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader');
+        $loader = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader');
         $loader->expects($this->any())->method('getResolverKeys')->willReturn($suffix);
         $containerInterface = $this->getMock('\Symfony\Component\DependencyInjection\ContainerInterface');
         $containerInterface->expects($this->any())->method('has')->with('conditional_router.routing_loader')->willReturn(true);
diff --git a/src/Tests/Router/ConditionalRoutesLoaderTest.php b/src/Tests/Router/ConditionalRoutesLoaderTest.php
index aab3560..848c31a 100644
--- a/src/Tests/Router/ConditionalRoutesLoaderTest.php
+++ b/src/Tests/Router/ConditionalRoutesLoaderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Piotrpolak\ConditionalRoutingBundle\Tests\Router;
+namespace PiotrPolak\ConditionalRoutingBundle\Tests\Router;
 
-use Piotrpolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader;
+use PiotrPolak\ConditionalRoutingBundle\Router\ConditionalRoutesLoader;
 use Symfony\Component\Routing\RouteCollection;
 
 class ConditionalRoutesLoaderTest extends \PHPUnit_Framework_TestCase
@@ -34,12 +34,12 @@ public function testSupports()
 
     public function testOneBundle()
     {
-        $definition = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
+        $definition = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
         $definition->expects($this->any())->method('getBundleName')->willReturn('SampleBundle');
         $definition->expects($this->any())->method('getResource')->willReturn('@SampleBundle/Resources/config/routing.yml');
         $definition->expects($this->any())->method('getType')->willReturn('yaml');
 
-        $routeResolver = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface');
+        $routeResolver = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface');
         $routeResolver->expects($this->atLeastOnce())
             ->method('resolveConditionalRoutingDefinitions')
             ->willReturn(array($definition));
@@ -57,17 +57,17 @@ public function testOneBundle()
 
     public function testTwoBundles()
     {
-        $definition = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
+        $definition = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
         $definition->expects($this->any())->method('getBundleName')->willReturn('SampleBundle');
         $definition->expects($this->any())->method('getResource')->willReturn('@SampleBundle/Resources/config/routing.yml');
         $definition->expects($this->any())->method('getType')->willReturn('yaml');
 
-        $definition2 = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
+        $definition2 = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Model\RoutingDefinition\BundleRoutingDefinitionInterface');
         $definition2->expects($this->any())->method('getBundleName')->willReturn('AAASecondSampleBundle');
         $definition2->expects($this->any())->method('getResource')->willReturn('@SampleBundle/Resources/config/routing.yml');
         $definition2->expects($this->any())->method('getType')->willReturn('yaml');
 
-        $routeResolver = $this->getMock('\Piotrpolak\ConditionalRoutingBundle\Model\RouteResolverInterface');
+        $routeResolver = $this->getMock('\PiotrPolak\ConditionalRoutingBundle\Model\RouteResolverInterface');
         $routeResolver->expects($this->atLeastOnce())
             ->method('resolveConditionalRoutingDefinitions')
             ->willReturn(array($definition, $definition2));