From 1d8fe957c2cf5b6a3731299ab9db1927bbc2ebbe Mon Sep 17 00:00:00 2001
From: Florian BLOUET <florian.blouet@gmail.com>
Date: Thu, 29 Oct 2015 11:45:22 +0100
Subject: [PATCH] add embed-bundle

---
 composer.json                       |  1 +
 composer.lock                       | 60 ++++++++++++++++++++++++++++-
 lib/Alchemy/Phrasea/Application.php |  5 +++
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b1d70178ea..787f07d327 100644
--- a/composer.json
+++ b/composer.json
@@ -31,6 +31,7 @@
         "php": ">=5.5",
 
         "alchemy-fr/tcpdf-clone":                "~6.0",
+        "alchemy/embed-bundle":                  "dev-master@dev",
         "alchemy/geonames-api-consumer":         "~0.1.0",
         "alchemy/google-plus-api-client":        "~0.6.2",
         "alchemy/mediavorus":                    "^0.4.4",
diff --git a/composer.lock b/composer.lock
index 3ed1158c5d..27439460d3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -120,6 +120,60 @@
             ],
             "time": "2013-06-21 15:51:20"
         },
+        {
+            "name": "alchemy/embed-bundle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/lostdalek/embed-bundle.git",
+                "reference": "304481b5b63bb8576bfb3211152f8d70d7d62b70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/lostdalek/embed-bundle/zipball/304481b5b63bb8576bfb3211152f8d70d7d62b70",
+                "reference": "304481b5b63bb8576bfb3211152f8d70d7d62b70",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7",
+                "silex/silex": "^1.0.0",
+                "squizlabs/php_codesniffer": "^2.3",
+                "symfony/symfony": "~2.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Alchemy\\Embed\\": "src/Component",
+                    "Alchemy\\EmbedBundle\\": "src/Bundle",
+                    "Alchemy\\EmbedProvider\\": "src/Provider"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "Alchemy\\EmbedBundle\\Tests\\": "tests/unit/Bundle"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florian Blouet",
+                    "email": "florian.blouet@gmail.com"
+                }
+            ],
+            "description": "Embed resources bundle",
+            "support": {
+                "source": "https://github.com/lostdalek/embed-bundle/tree/master",
+                "issues": "https://github.com/lostdalek/embed-bundle/issues"
+            },
+            "time": "2015-10-29 10:43:15"
+        },
         {
             "name": "alchemy/geonames-api-consumer",
             "version": "0.1.2",
@@ -2765,7 +2819,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-develop": "0.7-dev"
+                    "dev-develop": "0.6-dev"
                 }
             },
             "autoload": {
@@ -4258,7 +4312,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 7a06b92c1d..9c14017683 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea;
 
 use Alchemy\Cors\Options\DefaultProvider;
 use Alchemy\CorsProvider\CorsServiceProvider;
+use Alchemy\EmbedProvider\EmbedServiceProvider;
 use Alchemy\Geonames\GeonamesServiceProvider;
 use Alchemy\Phrasea\Application\Helper\AclAware;
 use Alchemy\Phrasea\Application\Helper\ApplicationBoxAware;
@@ -362,6 +363,8 @@ class Application extends SilexApplication
             'Alchemy\Phrasea\ControllerProvider\Thesaurus\Xmlhttp' => [],
             'Alchemy\Phrasea\ControllerProvider\User\Notifications' => [],
             'Alchemy\Phrasea\ControllerProvider\User\Preferences' => [],
+            'Alchemy\EmbedProvider\EmbedServiceProvider' => [],
+            'Alchemy\EmbedProvider\OembedServiceProvider' => [],
         ];
         foreach ($providers as $class => $values) {
             $this->register(new $class, $values);
@@ -683,6 +686,8 @@ class Application extends SilexApplication
             '/datafiles'                   => 'Alchemy\Phrasea\ControllerProvider\Datafiles',
             '/developers/'                 => 'Alchemy\Phrasea\ControllerProvider\Root\Developers',
             '/download/'                   => 'Alchemy\Phrasea\ControllerProvider\Prod\DoDownload',
+            '/embed/'                      => 'Alchemy\EmbedProvider\EmbedServiceProvider',
+            '/oembed/'                     => 'Alchemy\EmbedProvider\OembedServiceProvider',
             '/feeds/'                      => 'Alchemy\Phrasea\ControllerProvider\Root\RSSFeeds',
             '/include/minify'              => 'Alchemy\Phrasea\ControllerProvider\Minifier',
             '/login/'                      => 'Alchemy\Phrasea\ControllerProvider\Root\Login',