Updating to cohere to standards.

php-tmdb · Apr 4, 2015 · fcaa8d5 · fcaa8d5
1 parent c81f811
commit fcaa8d5
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 15 deletions.
diff --git a/ClientConfiguration.php b/ClientConfiguration.php
@@ -1,5 +1,5 @@
 <?php
-namespace Tmdb\Symfony;
+namespace Tmdb\SymfonyBundle;
 
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1,5 +1,5 @@
 <?php
-namespace Tmdb\Symfony\DependencyInjection;
+namespace Tmdb\SymfonyBundle\DependencyInjection;
 
 use Monolog\Logger;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

diff --git a/DependencyInjection/TmdbSymfonyExtension.php b/DependencyInjection/TmdbSymfonyExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tmdb\Symfony\DependencyInjection;
+namespace Tmdb\SymfonyBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;

diff --git a/README.md b/README.md
@@ -20,6 +20,18 @@ Add the following to your require block in composer.json config
 
 Configuration
 ----------------
+Register the bundle in `app/AppKernel.php`:
+
+```php
+    public function registerBundles()
+    {
+        $bundles = array(
+        ...
+        new Tmdb\SymfonyBundle\TmdbSymfonyBundle(),
+        ...
+    }
+```
+
 Add to your `app/config/config.yml` the following:
 
 ```yaml

diff --git a/Resources/config/repositories.xml b/Resources/config/repositories.xml
@@ -13,11 +13,7 @@
         <parameter key="tmdb.company_repository.class">Tmdb\Repository\CompanyRepository</parameter>
         <parameter key="tmdb.configuration_repository.class">Tmdb\Repository\ConfigurationRepository</parameter>
         <parameter key="tmdb.credits_repository.class">Tmdb\Repository\CreditsRepository</parameter>
-<<<<<<< HEAD
         <parameter key="tmdb.discover_repository.class">Tmdb\Repository\DiscoverRepository</parameter>
-=======
-        <parameter key="tmdb.discovery_repository.class">Tmdb\Repository\DiscoveryRepository</parameter>
->>>>>>> 08cc2bfb0a43509d0905ec0127f1b3dc5faf9c89
         <parameter key="tmdb.find_repository.class">Tmdb\Repository\FindRepository</parameter>
         <parameter key="tmdb.genre_repository.class">Tmdb\Repository\GenreRepository</parameter>
         <parameter key="tmdb.jobs_repository.class">Tmdb\Repository\JobsRepository</parameter>
@@ -114,5 +110,4 @@
             <argument type="service" id="tmdb.client" />
         </service>
     </services>
-
 </container>
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+yeah<?xml version="1.0" ?>
 
 <container xmlns="https://symfony.com/schema/dic/services"
     xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
@@ -9,7 +9,7 @@
         <parameter key="tmdb.api_key" />
         <!-- Main classes -->
         <parameter key="tmdb.client.class">Tmdb\Client</parameter>
-        <parameter key="tmdb.client_configuration.class">Tmdb\Symfony\ClientConfiguration</parameter>
+        <parameter key="tmdb.client_configuration.class">Tmdb\SymfonyBundle\ClientConfiguration</parameter>
         <parameter key="tmdb.api_token.class">Tmdb\ApiToken</parameter>
         <parameter key="tmdb.request_token.class">Tmdb\RequestToken</parameter>
         <parameter key="tmdb.session_token.class">Tmdb\SessionToken</parameter>

diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="https://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="tmdb.twig.image_extension.class">Tmdb\Symfony\Twig\TmdbExtension</parameter>
+        <parameter key="tmdb.twig.image_extension.class">Tmdb\SymfonyBundle\Twig\TmdbExtension</parameter>
     </parameters>
 
     <services>
@@ -14,5 +14,4 @@
             <tag name="twig.extension" />
         </service>
     </services>
-
 </container>
diff --git a/TmdbSymfonyBundle.php b/TmdbSymfonyBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tmdb\Symfony;
+namespace Tmdb\SymfonyBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 

diff --git a/Twig/TmdbExtension.php b/Twig/TmdbExtension.php
@@ -1,5 +1,5 @@
 <?php
-namespace Tmdb\Symfony\Twig;
+namespace Tmdb\SymfonyBundle\Twig;
 
 use Tmdb\Client;
 use Tmdb\Helper\ImageHelper;

diff --git a/composer.json b/composer.json
@@ -17,6 +17,6 @@
         "php-tmdb/api": "~2.0"
     },
     "autoload": {
-        "psr-4": { "Tmdb\\Symfony\\": "" }
+        "psr-4": { "Tmdb\\SymfonyBundle\\": "" }
     }
 }