Here and there renaming

algolia · Jan 12, 2015 · 90245e0 · 90245e0
1 parent cfc10d2
commit 90245e0
Show file tree

Hide file tree

Showing 57 changed files with 648 additions and 400 deletions.
diff --git a/AlgoliaAlgoliaSearchBundle.php b/AlgoliaAlgoliaSearchBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Algolia\AlgoliaSearchBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class AlgoliaAlgoliaSearchBundle extends Bundle
+{
+}
diff --git a/AlgoliaAlgoliaSearchSymfonyDoctrineBundle.php b/AlgoliaAlgoliaSearchSymfonyDoctrineBundle.php
diff --git a/Command/ReindexCommand.php b/Command/ReindexCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Command;
+namespace Algolia\AlgoliaSearchBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;

diff --git a/Command/SettingsCommand.php b/Command/SettingsCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Command;
+namespace Algolia\AlgoliaSearchBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
@@ -15,7 +15,7 @@ protected function configure()
         $this
         ->setName('algolia:settings')
         ->setDescription('Push the Algolia index settings defined in your project to the Algolia servers.')
-        ->addOption('push', 'p', InputOption::VALUE_NONE, 'Push the local settings to the remote Alogia servers.')
+        ->addOption('push', 'p', InputOption::VALUE_NONE, 'Push the local settings to the remote Algolia servers.')
         ->addOption('force', 'f', InputOption::VALUE_NONE, 'Do not ask for confirmation.')
         ;
     }

diff --git a/...AlgoliaSearchSymfonyDoctrineExtension.php → ...jection/AlgoliaAlgoliaSearchExtension.php b/...AlgoliaSearchSymfonyDoctrineExtension.php → ...jection/AlgoliaAlgoliaSearchExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\DependencyInjection;
+namespace Algolia\AlgoliaSearchBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
@@ -12,7 +12,7 @@
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
-class AlgoliaAlgoliaSearchSymfonyDoctrineExtension extends Extension
+class AlgoliaAlgoliaSearchExtension extends Extension
 {
     /**
      * {@inheritdoc}

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\DependencyInjection;
+namespace Algolia\AlgoliaSearchBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

diff --git a/EventListener/AlgoliaSearchDoctrineEventSubscriber.php b/EventListener/AlgoliaSearchDoctrineEventSubscriber.php
@@ -1,10 +1,10 @@
 <?php
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\EventListener;
+namespace Algolia\AlgoliaSearchBundle\EventListener;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Indexer\Indexer;
+use Algolia\AlgoliaSearchBundle\Indexer\Indexer;
 
 class AlgoliaSearchDoctrineEventSubscriber implements EventSubscriber
 {

diff --git a/Exception/NoPrimaryKey.php b/Exception/NoPrimaryKey.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception;
+namespace Algolia\AlgoliaSearchBundle\Exception;
 
 class NoPrimaryKey extends \Exception
 {

diff --git a/Exception/NotAnAlgoliaEntity.php b/Exception/NotAnAlgoliaEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception;
+namespace Algolia\AlgoliaSearchBundle\Exception;
 
 class NotAnAlgoliaEntity extends \Exception
 {

diff --git a/Exception/NotCallable.php b/Exception/NotCallable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception;
+namespace Algolia\AlgoliaSearchBundle\Exception;
 
 class NotCallable extends \Exception
 {

diff --git a/Exception/UnknownEntity.php b/Exception/UnknownEntity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception;
+namespace Algolia\AlgoliaSearchBundle\Exception;
 
 class UnknownEntity extends \Exception
 {

diff --git a/Indexer/Indexer.php b/Indexer/Indexer.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Indexer;
+namespace Algolia\AlgoliaSearchBundle\Indexer;
 
 use Doctrine\ORM\EntityManager;
 
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception\UnknownEntity;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception\NoPrimaryKey;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception\NotAnAlgoliaEntity;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Loader\AnnotationLoader;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\SearchResult\SearchResult;
+use Algolia\AlgoliaSearchBundle\Exception\UnknownEntity;
+use Algolia\AlgoliaSearchBundle\Exception\NoPrimaryKey;
+use Algolia\AlgoliaSearchBundle\Exception\NotAnAlgoliaEntity;
+use Algolia\AlgoliaSearchBundle\Mapping\Loader\AnnotationLoader;
+use Algolia\AlgoliaSearchBundle\SearchResult\SearchResult;
 
 class Indexer
 {
@@ -89,7 +89,7 @@ public function setApiSettings($application_id, $api_key)
     /**
      * Right now this only returns a MetaDataAnnotationLoader,
      * but this abstraction is provided to enable other loaders later.
-     * A loader just has to implement the Algolia\AlgoliaSearchSymfonyDoctrineBundle\MetaData\MetaDataLoaderInterface
+     * A loader just has to implement the Algolia\AlgoliaSearchBundle\MetaData\MetaDataLoaderInterface
      * @return see MetaDataLoaderInterface
      * @internal
      */

diff --git a/Indexer/ManualIndexer.php b/Indexer/ManualIndexer.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Indexer;
+namespace Algolia\AlgoliaSearchBundle\Indexer;
 
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Doctrine\ORM\Query;
 
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Exception\NotAnAlgoliaEntity;
+use Algolia\AlgoliaSearchBundle\Exception\NotAnAlgoliaEntity;
 
 class ManualIndexer
 {

diff --git a/Mapping/Annotation/Attribute.php b/Mapping/Annotation/Attribute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Annotation;
 
 /**
  * @Annotation

diff --git a/Mapping/Annotation/Index.php b/Mapping/Annotation/Index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Annotation;
 
 /**
  * @Annotation
@@ -129,7 +129,7 @@ public function toArray()
             $settings['algoliaName'] = $this->algoliaName;
         }
 
-        foreach (\Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Index::$algoliaSettingsProps as $field) {
+        foreach (\Algolia\AlgoliaSearchBundle\Mapping\Index::$algoliaSettingsProps as $field) {
             $settings[$field] = $this->$field;
         }
 

diff --git a/Mapping/Annotation/IndexIf.php b/Mapping/Annotation/IndexIf.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Annotation;
 
 /**
  * @Annotation

diff --git a/Mapping/Description.php b/Mapping/Description.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping;
+namespace Algolia\AlgoliaSearchBundle\Mapping;
 
 class Description
 {

diff --git a/Mapping/Helper/ChangeAwareMethod.php b/Mapping/Helper/ChangeAwareMethod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Helper;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Helper;
 
 class ChangeAwareMethod
 {

diff --git a/Mapping/Index.php b/Mapping/Index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping;
+namespace Algolia\AlgoliaSearchBundle\Mapping;
 
 class Index
 {

diff --git a/Mapping/IndexIf.php b/Mapping/IndexIf.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping;
+namespace Algolia\AlgoliaSearchBundle\Mapping;
 
 class IndexIf extends Helper\ChangeAwareMethod
 {

diff --git a/Mapping/Loader/AnnotationLoader.php b/Mapping/Loader/AnnotationLoader.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Loader;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Loader;
 
 use Doctrine\ORM\EntityManager;
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Cache\ArrayCache;
 
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation\Index as IndexAnnotation;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation\Attribute as IndexedAttributeAnnotation;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation\IndexIf as IndexIfAnnotation;
+use Algolia\AlgoliaSearchBundle\Mapping\Annotation\Index as IndexAnnotation;
+use Algolia\AlgoliaSearchBundle\Mapping\Annotation\Attribute as IndexedAttributeAnnotation;
+use Algolia\AlgoliaSearchBundle\Mapping\Annotation\IndexIf as IndexIfAnnotation;
 
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Index;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\IndexIf;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Property;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Method;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Description;
+use Algolia\AlgoliaSearchBundle\Mapping\Index;
+use Algolia\AlgoliaSearchBundle\Mapping\IndexIf;
+use Algolia\AlgoliaSearchBundle\Mapping\Property;
+use Algolia\AlgoliaSearchBundle\Mapping\Method;
+use Algolia\AlgoliaSearchBundle\Mapping\Description;
 
 class AnnotationLoader implements LoaderInterface
 {

diff --git a/Mapping/Loader/LoaderInterface.php b/Mapping/Loader/LoaderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Loader;
+namespace Algolia\AlgoliaSearchBundle\Mapping\Loader;
 
 use Doctrine\ORM\EntityManager;
 
@@ -9,7 +9,7 @@ interface LoaderInterface
     /**
 	 * Extracts the Algolia metaData from an entity.
 	 *
-	 * @return Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Description
+	 * @return Algolia\AlgoliaSearchBundle\Mapping\Description
 	 */
     public function getMetaData($entity, EntityManager $em);
 }
diff --git a/Mapping/Method.php b/Mapping/Method.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping;
+namespace Algolia\AlgoliaSearchBundle\Mapping;
 
 class Method extends Helper\ChangeAwareMethod
 {

diff --git a/Mapping/Property.php b/Mapping/Property.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping;
+namespace Algolia\AlgoliaSearchBundle\Mapping;
 
 class Property
 {

diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-AlgoliaSearchSymfonyDoctrineBundle
+AlgoliaSearchBundle
 ==================================
 
 This Symfony bundle provides an easy way to integrate Algolia Search into your Symfony2 with Doctrine2 application.
 
-[![Build Status](https://travis-ci.org/djfm/AlgoliaSearchSymfonyDoctrineBundle.svg?branch=master)](https://travis-ci.org/djfm/AlgoliaSearchSymfonyDoctrineBundle)
+[![Build Status](https://travis-ci.org/algolia/AlgoliaSearchBundle.svg?branch=master)](https://travis-ci.org/algolia/AlgoliaSearchBundle)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -33,7 +33,7 @@ Add this line to your `composer.json` file:
 ```json
 "require": {
     ...
-    "djfm/algolia-search-symfony-doctrine-bundle": "dev-master",
+    "algolia/algolia-search-bundle": "1.0.0",
     ...
 }
 ```
@@ -42,12 +42,12 @@ Then run `composer update`.
 
 ## Register the bundle
 
-Add `Algolia\AlgoliaSearchSymfonyDoctrineBundle\AlgoliaAlgoliaSearchSymfonyDoctrineBundle()` to your application Kernel:
+Add `Algolia\AlgoliaSearchBundle\AlgoliaAlgoliaSearchBundle()` to your application Kernel:
 ```php
 $bundles = array(
     new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
     new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-    new Algolia\AlgoliaSearchSymfonyDoctrineBundle\AlgoliaAlgoliaSearchSymfonyDoctrineBundle(),
+    new Algolia\AlgoliaSearchBundle\AlgoliaAlgoliaSearchBundle(),
 );
 ```
 
@@ -76,15 +76,15 @@ Currently, mapping is only possible with annotations.
 
 The `Attribute` annotation marks a field or method for indexing by Algolia.
 
-All annotations are defined in the `Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation` namespace.
+All annotations are defined in the `Algolia\AlgoliaSearchBundle\Mapping\Annotation` namespace.
 
 Below is an example of an indexed field and an indexed property:
 
 ```php
 namespace MyCoolAppBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Algolia\AlgoliaSearchSymfonyDoctrineBundle\Mapping\Annotation as Algolia;
+use Algolia\AlgoliaSearchBundle\Mapping\Annotation as Algolia;
 
 /**
  * Product

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,6 +1,6 @@
 parameters:
-    algolia.indexer.class: Algolia\AlgoliaSearchSymfonyDoctrineBundle\Indexer\Indexer
-    algolia.indexer_subscriber.class: Algolia\AlgoliaSearchSymfonyDoctrineBundle\EventListener\AlgoliaSearchDoctrineEventSubscriber
+    algolia.indexer.class: Algolia\AlgoliaSearchBundle\Indexer\Indexer
+    algolia.indexer_subscriber.class: Algolia\AlgoliaSearchBundle\EventListener\AlgoliaSearchEventSubscriber
 
 services:
     algolia.indexer:

diff --git a/SearchResult/SearchResult.php b/SearchResult/SearchResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\SearchResult;
+namespace Algolia\AlgoliaSearchBundle\SearchResult;
 
 class SearchResult
 {

diff --git a/...ymfonyDoctrine/AlgoliaIntegrationTest.php → .../AlgoliaSearch/AlgoliaIntegrationTest.php b/...ymfonyDoctrine/AlgoliaIntegrationTest.php → .../AlgoliaSearch/AlgoliaIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Tests;
+namespace Algolia\AlgoliaSearchBundle\Tests;
 
 class AlgoliaIntegrationTest extends BaseTest
 {
@@ -151,13 +151,13 @@ public function testSearch()
 
         $results = $this->getIndexer()->search(
             $this->getEntityManager(),
-            'Algolia\AlgoliaSearchSymfonyDoctrineBundle\Tests\Entity\ProductForAlgoliaIntegrationTest',
+            'Algolia\AlgoliaSearchBundle\Tests\Entity\ProductForAlgoliaIntegrationTest',
             'My First Product'
         );
 
         $this->assertEquals(1, $results->getNbHits());
         $this->assertEquals(
-            'Algolia\AlgoliaSearchSymfonyDoctrineBundle\Tests\Entity\ProductForAlgoliaIntegrationTest',
+            'Algolia\AlgoliaSearchBundle\Tests\Entity\ProductForAlgoliaIntegrationTest',
             get_class($results->getHit(0))
         );
         $this->assertEquals(

diff --git a/...iaSearchSymfonyDoctrine/CallbacksTest.php → Tests/AlgoliaSearch/CallbacksTest.php b/...iaSearchSymfonyDoctrine/CallbacksTest.php → Tests/AlgoliaSearch/CallbacksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Algolia\AlgoliaSearchSymfonyDoctrineBundle\Tests;
+namespace Algolia\AlgoliaSearchBundle\Tests;
 
 class CallbacksTest extends BaseTest
 {