From 1fc92756f3a05ec1edf2b580df75ec93e48b07fd Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Mon, 22 Oct 2012 18:39:17 +0200
Subject: [PATCH] [SearchEngine] Update dependencies

---
 .gitmodules       |  3 ---
 composer.json     |  1 +
 composer.lock     | 56 ++++++++++++++++++++++++++++++++++++++++++-----
 lib/vendor/sphinx |  1 -
 4 files changed, 52 insertions(+), 9 deletions(-)
 delete mode 160000 lib/vendor/sphinx

diff --git a/.gitmodules b/.gitmodules
index 14e291f676..f715e843df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "lib/vendor/recaptcha"]
 	path = lib/vendor/recaptcha
 	url = git://github.com/alchemy-fr/recaptcha.git
-[submodule "lib/vendor/sphinx"]
-	path = lib/vendor/sphinx
-	url = git://github.com/alchemy-fr/SphinxSearch-PHP-SDK.git
 [submodule "www/include/vendor/humane-js"]
 	path = www/include/vendor/humane-js
 	url = https://github.com/wavded/humane-js.git
diff --git a/composer.json b/composer.json
index fe430aadaf..3bcc8adcfb 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "monolog/monolog": "1.0.*",
         "neutron/silex-badfaith-provider": "dev-master",
         "neutron/silex-filesystem-provider": "dev-master",
+        "neutron/sphinxsearch-api": ">=2.0.5",
         "php-xpdf/php-xpdf": "dev-master",
         "phpexiftool/phpexiftool": "dev-master",
         "silex/silex": "1.0.*",
diff --git a/composer.lock b/composer.lock
index de911650aa..0e1cad9c1c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -861,6 +861,48 @@
                 "temporary-filesystem"
             ]
         },
+        {
+            "name": "neutron/sphinxsearch-api",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client",
+                "reference": "2.0.5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client/zipball/2.0.5",
+                "reference": "2.0.5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=4"
+            },
+            "time": "1350903759",
+            "type": "library",
+            "installation-source": "source",
+            "autoload": {
+                "classmap": [
+                    "sphinxapi.php"
+                ]
+            },
+            "license": [
+                "GPL"
+            ],
+            "authors": [
+                {
+                    "name": "Andrew Aksyonoff",
+                    "homepage": "http://sphinxsearch.com/"
+                }
+            ],
+            "description": "SphinxSearch PHP API",
+            "homepage": "http://sphinxsearch.com/",
+            "keywords": [
+                "api",
+                "Sphinx Search",
+                "search-engine"
+            ]
+        },
         {
             "name": "php-ffmpeg/php-ffmpeg",
             "version": "dev-master",
@@ -1080,7 +1122,8 @@
             "keywords": [
                 "pdf",
                 "xpdf"
-            ]
+            ],
+            "time": "1349703734"
         },
         {
             "name": "phpexiftool/exiftool",
@@ -1117,7 +1160,8 @@
             "keywords": [
                 "exiftool",
                 "metadatas"
-            ]
+            ],
+            "time": "1346256086"
         },
         {
             "name": "phpexiftool/phpexiftool",
@@ -1171,7 +1215,8 @@
             "keywords": [
                 "metadata",
                 "exiftool"
-            ]
+            ],
+            "time": "1346681208"
         },
         {
             "name": "pimple/pimple",
@@ -1218,7 +1263,8 @@
             "keywords": [
                 "dependency injection",
                 "container"
-            ]
+            ],
+            "time": "1347278988"
         },
         {
             "name": "silex/silex",
@@ -1805,4 +1851,4 @@
         "doctrine/data-fixtures": 20,
         "fabpot/php-cs-fixer": 20
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/sphinx b/lib/vendor/sphinx
deleted file mode 160000
index 3435431efe..0000000000
--- a/lib/vendor/sphinx
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3435431efe058e84adcf731c70d0354f41f04a6c