Merge branch '3.8'

Conflicts: CHANGELOG.md bin/console bin/developer bin/setup bower.json composer.json composer.lock features/bootstrap/FeatureContext.php features/bootstrap/GuiContext.php lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php lib/Alchemy/Phrasea/Command/CreateCollection.php lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php lib/Alchemy/Phrasea/Controller/Admin/Collection.php lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php lib/Alchemy/Phrasea/Controller/Api/V1.php lib/Alchemy/Phrasea/Controller/Client/Baskets.php lib/Alchemy/Phrasea/Controller/Client/Root.php lib/Alchemy/Phrasea/Controller/Prod/Basket.php lib/Alchemy/Phrasea/Controller/Prod/Export.php lib/Alchemy/Phrasea/Controller/Prod/Property.php lib/Alchemy/Phrasea/Controller/Prod/Records.php lib/Alchemy/Phrasea/Controller/Prod/Tools.php lib/Alchemy/Phrasea/Controller/Prod/Upload.php lib/Alchemy/Phrasea/Controller/Root/Login.php lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php lib/Alchemy/Phrasea/Core/Version.php lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php lib/Alchemy/Phrasea/Helper/DatabaseHelper.php lib/Alchemy/Phrasea/Helper/User/Edit.php lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php lib/Doctrine/Entities/AuthFailure.php lib/Doctrine/Entities/Basket.php lib/Doctrine/Entities/BasketElement.php lib/Doctrine/Entities/LazaretAttribute.php lib/Doctrine/Entities/LazaretCheck.php lib/Doctrine/Entities/LazaretFile.php lib/Doctrine/Entities/LazaretSession.php lib/Doctrine/Entities/Session.php lib/Doctrine/Entities/SessionModule.php lib/Doctrine/Entities/StoryWZ.php lib/Doctrine/Entities/UsrList.php lib/Doctrine/Entities/UsrListEntry.php lib/Doctrine/Entities/UsrListOwner.php lib/Doctrine/Entities/ValidationData.php lib/Doctrine/Entities/ValidationParticipant.php lib/Doctrine/Entities/ValidationSession.php lib/Doctrine/Logger/MonologSQLLogger.php lib/Doctrine/Repositories/BasketRepository.php lib/Doctrine/Repositories/ValidationParticipantRepository.php lib/Doctrine/Types/Binary.php lib/Doctrine/Types/Blob.php lib/Doctrine/Types/Enum.php lib/Doctrine/Types/LongBlob.php lib/Doctrine/Types/VarBinary.php lib/classes/API/OAuth2/Account.php lib/classes/API/OAuth2/Application.php lib/classes/API/OAuth2/Application/OfficePlugin.php lib/classes/API/OAuth2/AuthCode.php lib/classes/API/OAuth2/RefreshToken.php lib/classes/API/OAuth2/Token.php lib/classes/API/V1/Abstract.php lib/classes/API/V1/Interface.php lib/classes/API/V1/adapter.php lib/classes/API/V1/exception/abstract.php lib/classes/API/V1/exception/badrequest.php lib/classes/API/V1/exception/forbidden.php lib/classes/API/V1/exception/internalservererror.php lib/classes/API/V1/exception/maintenance.php lib/classes/API/V1/exception/methodnotallowed.php lib/classes/API/V1/exception/notfound.php lib/classes/API/V1/exception/unauthorized.php lib/classes/API/V1/result.php lib/classes/Exception/Feed/EntryNotFound.php lib/classes/Exception/Feed/ItemNotFound.php lib/classes/Exception/Feed/PublisherNotFound.php lib/classes/Feed/Abstract.php lib/classes/Feed/Adapter.php lib/classes/Feed/Aggregate.php lib/classes/Feed/Collection.php lib/classes/Feed/CollectionInterface.php lib/classes/Feed/Entry/Adapter.php lib/classes/Feed/Entry/Collection.php lib/classes/Feed/Entry/CollectionInterface.php lib/classes/Feed/Entry/Interface.php lib/classes/Feed/Entry/Item.php lib/classes/Feed/Entry/ItemInterface.php lib/classes/Feed/Interface.php lib/classes/Feed/Link.php lib/classes/Feed/LinkInterface.php lib/classes/Feed/Publisher/Adapter.php lib/classes/Feed/Publisher/Interface.php lib/classes/Feed/Token.php lib/classes/Feed/TokenAggregate.php lib/classes/Feed/XML/Abstract.php lib/classes/Feed/XML/Atom.php lib/classes/Feed/XML/Cooliris.php lib/classes/Feed/XML/Interface.php lib/classes/Feed/XML/RSS.php lib/classes/Feed/XML/RSS/Image.php lib/classes/Feed/XML/RSS/ImageInterface.php lib/classes/User/Adapter.php lib/classes/User/Interface.php lib/classes/appbox/register.php lib/classes/connection.php lib/classes/connection/abstract.php lib/classes/connection/interface.php lib/classes/connection/pdo.php lib/classes/connection/pdoStatementDebugger.php lib/classes/deprecated/countries.php lib/classes/deprecated/inscript.api.php lib/classes/eventsmanager/event/test.php lib/classes/ftpclient.php lib/classes/http/request.php lib/classes/media/subdef.php lib/classes/module/console/schedulerStart.php lib/classes/module/console/schedulerState.php lib/classes/module/console/schedulerStop.php lib/classes/module/console/taskState.php lib/classes/module/console/tasklist.php lib/classes/module/console/taskrun.php lib/classes/patch/320alpha4b.php lib/classes/patch/3715alpha1a.php lib/classes/patch/379alpha1a.php lib/classes/patch/380alpha10a.php lib/classes/patch/380alpha11a.php lib/classes/patch/380alpha13a.php lib/classes/patch/380alpha14a.php lib/classes/patch/380alpha15a.php lib/classes/patch/380alpha16a.php lib/classes/patch/380alpha17a.php lib/classes/patch/380alpha18a.php lib/classes/patch/380alpha3a.php lib/classes/patch/380alpha4a.php lib/classes/patch/380alpha6a.php lib/classes/patch/380alpha8a.php lib/classes/patch/380alpha9a.php lib/classes/patch/381alpha1b.php lib/classes/patch/381alpha2a.php lib/classes/patch/381alpha3a.php lib/classes/patch/381alpha4a.php lib/classes/patch/383alpha1a.php lib/classes/patch/383alpha2a.php lib/classes/patch/383alpha3a.php lib/classes/patch/383alpha4a.php lib/classes/record/adapter.php lib/classes/record/preview.php lib/classes/recordutils.php lib/classes/recordutils/audio.php lib/classes/recordutils/document.php lib/classes/recordutils/map.php lib/classes/recordutils/video.php lib/classes/registry.php lib/classes/registryInterface.php lib/classes/set/order.php lib/classes/system/url.php lib/classes/task/Scheduler.php lib/classes/task/appboxAbstract.php lib/classes/task/databoxAbstract.php lib/classes/task/manager.php lib/classes/task/period/RecordMover.php lib/classes/task/period/apibridge.php lib/classes/task/period/apiwebhooks.php lib/classes/task/period/archive.php lib/classes/task/period/cindexer.php lib/classes/task/period/emptyColl.php lib/classes/task/period/ftp.php lib/classes/task/period/ftpPull.php lib/classes/task/period/subdef.php lib/classes/task/period/test.php lib/classes/task/period/writemeta.php lib/conf.d/PhraseaFixture/AbstractWZ.php lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php lib/conf.d/PhraseaFixture/Story/LoadOneStory.php lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php lib/conf.d/PhraseaFixture/UsrLists/UsrList.php lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php templates/web/admin/collection/collection.html.twig templates/web/common/dialog_export.html.twig templates/web/common/menubar.html.twig templates/web/prod/actions/Tools/index.html.twig templates/web/prod/index.html.twig templates/web/prod/upload/upload-flash.html.twig templates/web/prod/upload/upload.html.twig templates/web/report/report_layout_child.html.twig templates/web/setup/step2.html.twig templates/web/thesaurus/new-synonym-dialog.html.twig templates/web/thesaurus/properties.html.twig templates/web/thesaurus/search.html.twig tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
2025-10-07 01:54:27 +00:00 · 2015-02-05 18:38:49 +01:00
parent 5e33fdafe4 e9fb3d44fc
commit 949bf06cac
759 changed files with 1932 additions and 1653 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # CHANGELOG

+
 * 3.9.0 (xxxx-xx-xx)

  - Convert Orders custom adapter to Doctrine entity.
@@ -9,6 +10,61 @@
  - Convert Ftp Export custom adapter to Doctrine entity.
  - Session management is now part of Phraseanet configuration.

+## 3.8.6 (2015-01-20)
+
+  - BugFix : Fixes the stories editing. When opening an editing form, the style applied to the notice doesn't match its selection
+  - BugFix : Fixes the sending of a return receipt (attributed in the headers of the email) at the export
+  - BugFix : Fixes the SMTP field in the Administration panel which is pre filled with a wrong information
+  - BugFix : Fixes a bad mapping of the registration fields on the homepage and the displayed fields in the registration requests in the Administration
+  - BugFix : In the detailed view, fixes the list of the stories titles which is truncated.
+  - BugFix : Fixes Oauth 2.0, the authorization of the client applications is not systematically requested when logging in.
+  - BugFix : When uploading documents, the first status is not taken into account
+  - BugFix : Fixes the cache invalidation of the status bits icons when changed in Admin section
+  - BugFix : Fixes the reordering of the media in a basket
+  - BugFix : Fixes the control of field "name" when creating a push or a feedback
+  - BugFix : Fixes Oauth 2.0 message when the connection fails
+  - BugFix : Fixes the suppression of diffusion lists on IE9
+  - BugFix : Fixes the anonymous download when a user is logged off
+  - BugFix : Fixes the setup of the default display mode of the collections (stamp/watermark) on a non authenticated mode
+  - BugFix : Fixes the printing of the thumbnails of documents for the videos or PDFs
+  - BugFix : Fixes the reordering of the basket when the documents come from n different collections
+  - BugFix : Fixes the application of the "status bits" when the status bit is defined by the task "RecordMover"
+  - BugFix : Fixes the detection of duplicates for PDF files
+  - BugFix : Fixes the rewriting of metadata of a document, when the name space is empty
+  - BugFix : Fixes the injection of the rights of a user for a connection via Oauth2
+  - BugFix : Fixes the invalidation of the cache when disassembling a databox
+  - BugFix : Fixes the sorting criteria by date and by field, according to users rights
+  - BugFix : Fixes the right to download for the guest access
+  - BugFix : Fixes the report generation for the number of downloads and connections
+  - BugFix : Fixes the memory use of the task for the the sub-definitions creation
+  - BugFix : Fixes the generation of sub-definitions when editing the sub-definitions task
+  - BugFix : Fixes the display of multivalued fields in the editing window
+  - BugFix : Fixes the adding of a term in the candidates which was is not detected as present in the candidates
+  - BugFix : Fixes the users' rights when using the API
+  - BugFix : When being redirected, fixes the add of parameters after login.
+  - BugFix : Fixes the thumbnails' size of EPS files.
+  - BugFix : The "Delete" action of a task ("Record Mover" type) is now taken into consideration.
+  - BugFix : The edition dates of a record sent back by the API are now fixed
+  - BuxFix : Writing of IPTC fields is fixed, when setting up a stamp on a media (image type). 
+  - Enhancement : Possibility to adapt a task "creation of subdefinition", by database and type of document 
+  - Enhancement : Reporting modifications of Flickr & Dailymotion APIs (Bridge feature).
+  - Enhancement : Adding the possibility to overload the name space reserved for the cache
+  - Enhancement : Adding the possibility to deactivate the use of the TaskManager by instance
+  - Enhancement : Adding an extended format for the API replies. Get more information about Phraseanet records in one API request.
+  - Enhancement : Adding a block for the help text of Production when no result is displayed to authorize the modification of this text via a plugin
+  - Enhancement : Adding the possibility to deactivate the notifications to the users for a new publication
+  - Enhancement : Adding the possibility to modify the rotation of pictures representing the videos and PDF files
+  - Enhancement : Adding the possibility to serve the thumbnails of the application in a static way for improved performances
+  - Enhancement : Adding the possibility to deactivate the lazy load for the thumbnails
+  - Enhancement : The tasks can now reconnect automatically to MySQL
+  - Enhancement : The sorting on the fields "Number" is now possible
+  - Enhancement : The sub-definition creation task now displays the remaining number of sub-definitions to create
+  - Enhancement : Adding the date of edition of the media
+  - Enhancement : Use of http cache for the display of documents
+  - Enhancement : Adding the possibility to deactivate the CSRF for the authentication form
+  - NewFeature : Adding a Vagrant VM (for developers and testers). The setup is quicker: development environments made easy.
+  - NewFeature : Adding a command for the file generation crossdomain.xml depending on the configuration.
+
 ## 3.8.5 (2014-07-08)

  - BugFix : Fix Flickr connexion throught Bridge Application
--- a/bin/console
+++ b/bin/console
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -11,6 +11,8 @@

 namespace KonsoleKommander;

+
+use Alchemy\Phrasea\Command\BuildSubdefs;
 use Alchemy\Phrasea\Command\Plugin\ListPlugin;
 use Alchemy\Phrasea\Command\Setup\H264ConfigurationDumper;
 use Alchemy\Phrasea\Command\Setup\H264MappingGenerator;
@@ -107,6 +109,7 @@ $cli->command(new CreateCollection('collection:create'));
 $cli->command(new RecordAdd('records:add'));
 $cli->command(new RescanTechnicalDatas('records:rescan-technical-datas'));
 $cli->command(new BuildMissingSubdefs('records:build-missing-subdefs'));
+$cli->command(new BuildSubdefs('records:build-subdefs'));

 $cli->command(new AddPlugin());
 $cli->command(new ListPlugin());
--- a/bin/developer
+++ b/bin/developer
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/bin/setup
+++ b/bin/setup
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/composer.json
+++ b/composer.json
@@ -40,14 +40,13 @@
        "alchemy/geonames-api-consumer"    : "~0.1.0",
        "goodby/csv"                       : "~1.0",
        "guzzle/guzzle"                    : "~3.0",
-        "imagine/imagine"                  : "dev-0.6.1-flatten-layer as 0.6.1",
-        "igorw/get-in"                     : "~1.0",
+        "imagine/imagine"                  : "dev-alchemy-0.6.2 as 0.6.2","igorw/get-in"                     : "~1.0",
        "ircmaxell/random-lib"             : "~1.0",
-       "jms/serializer"                    : "~0.10",
+        "jms/serializer"                   : "~0.10",
        "jms/translation-bundle"           : "~1.1",
        "justinrainbow/json-schema"        : "~1.3",
        "mediavorus/mediavorus"            : "~0.4.0",
-        "media-alchemyst/media-alchemyst"  : "dev-master",
+        "media-alchemyst/media-alchemyst"  : "~0.4",
        "monolog/monolog"                  : "~1.3",
        "mrclay/minify"                    : "~2.1.6",
        "neutron/process-manager"          : "2.0.x-dev@dev",
--- a/composer.lock
+++ b/composer.lock
@@ -11,15 +11,9 @@
            "version": "6.0.039",
            "source": {
                "type": "git",
-                "url": "https://github.com/alchemy-fr/tcpdf-clone.git",
+                "url": "https://github.com/alchemy-fr/tcpdf-clone",
                "reference": "2ba0248a7187f1626df6c128750650416267f0e7"
            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/tcpdf-clone/zipball/2ba0248a7187f1626df6c128750650416267f0e7",
-                "reference": "2ba0248a7187f1626df6c128750650416267f0e7",
-                "shasum": ""
-            },
            "require": {
                "php": ">=5.3.0"
            },
@@ -66,10 +60,6 @@
                "qrcode",
                "tcpdf"
            ],
-            "support": {
-                "source": "https://github.com/alchemy-fr/tcpdf-clone/tree/6.0.039",
-                "issues": "https://github.com/alchemy-fr/tcpdf-clone/issues"
-            },
            "time": "2013-10-13 16:11:17"
        },
        {
@@ -113,7 +103,7 @@
                    "homepage": "http://www.lickmychip.com/"
                },
                {
-                    "name": "nlegoff",
+                    "name": "Nicolas Le Goff",
                    "email": "legoff.n@gmail.com"
                },
                {
@@ -940,8 +930,7 @@
                {
                    "name": "Jonathan Wage",
                    "email": "jonwage@gmail.com",
-                    "homepage": "http://www.jwage.com/",
-                    "role": "Creator"
+                    "homepage": "http://www.jwage.com/"
                },
                {
                    "name": "Guilherme Blanco",
@@ -959,7 +948,7 @@
                {
                    "name": "Johannes Schmitt",
                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                    "role": "Developer of wrapped JMSSerializerBundle"
                }
            ],
@@ -1013,7 +1002,7 @@
                {
                    "name": "Johannes Schmitt",
                    "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                    "role": "Developer of wrapped JMSSerializerBundle"
                }
            ],
@@ -1218,13 +1207,13 @@
            "version": "v1.0.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/igorw/evenement.git",
-                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d"
+                "url": "https://github.com/igorw/evenement",
+                "reference": "v1.0.0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/igorw/evenement/zipball/fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
-                "reference": "fa966683e7df3e5dd5929d984a44abfbd6bafe8d",
+                "url": "https://github.com/igorw/evenement/zipball/v1.0.0",
+                "reference": "v1.0.0",
                "shasum": ""
            },
            "require": {
@@ -1251,7 +1240,7 @@
            "keywords": [
                "event-dispatcher"
            ],
-            "time": "2012-05-30 15:01:08"
+            "time": "2012-05-30 08:01:08"
        },
        {
            "name": "facebook/php-sdk",
@@ -1575,16 +1564,16 @@
        },
        {
            "name": "imagine/imagine",
-            "version": "dev-0.6.1-flatten-layer",
+            "version": "dev-alchemy-0.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/Imagine.git",
-                "reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1"
+                "reference": "6605d13e3b24f335fe80099c193546671158c041"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/372f36e2d76e4ca1fbdccda57c23b8483ed700b1",
-                "reference": "372f36e2d76e4ca1fbdccda57c23b8483ed700b1",
+                "url": "https://api.github.com/repos/alchemy-fr/Imagine/zipball/6605d13e3b24f335fe80099c193546671158c041",
+                "reference": "6605d13e3b24f335fe80099c193546671158c041",
                "shasum": ""
            },
            "require": {
@@ -1601,7 +1590,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-develop": "0.6-dev"
+                    "dev-develop": "0.7-dev"
                }
            },
            "autoload": {
@@ -1628,9 +1617,9 @@
                "image processing"
            ],
            "support": {
-                "source": "https://github.com/alchemy-fr/Imagine/tree/0.6.1-flatten-layer"
+                "source": "https://github.com/alchemy-fr/Imagine/tree/alchemy-0.6.2"
            },
-            "time": "2014-11-19 14:31:17"
+            "time": "2015-01-13 18:12:26"
        },
        {
            "name": "ircmaxell/random-lib",
@@ -2025,16 +2014,16 @@
        },
        {
            "name": "media-alchemyst/media-alchemyst",
-            "version": "dev-master",
+            "version": "0.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
-                "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598"
+                "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/62fec183416ce6dfdf22e832f0de3c7442a23598",
-                "reference": "62fec183416ce6dfdf22e832f0de3c7442a23598",
+                "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
+                "reference": "cf1fdacbaf0d54440fa7b61c750234d0befde0c8",
                "shasum": ""
            },
            "require": {
@@ -2094,7 +2083,7 @@
                "video",
                "video processing"
            ],
-            "time": "2014-10-20 07:22:23"
+            "time": "2015-02-03 16:25:38"
        },
        {
            "name": "mediavorus/mediavorus",
@@ -2254,7 +2243,7 @@
            ],
            "authors": [
                {
-                    "name": "Steve Clay",
+                    "name": "Stephen Clay",
                    "email": "steve@mrclay.org",
                    "homepage": "http://www.mrclay.org/",
                    "role": "Developer"
@@ -2440,21 +2429,21 @@
            "source": {
                "type": "git",
                "url": "https://github.com/romainneutron/Imagine-Silex-Service-Provider.git",
-                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084"
+                "reference": "0.1.2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/a8a7862ae90419f2b23746cd8436c2310e4eb084",
-                "reference": "a8a7862ae90419f2b23746cd8436c2310e4eb084",
+                "url": "https://api.github.com/repos/romainneutron/Imagine-Silex-Service-Provider/zipball/0.1.2",
+                "reference": "0.1.2",
                "shasum": ""
            },
            "require": {
                "imagine/imagine": "*",
                "php": ">=5.3.3",
-                "silex/silex": "~1.0"
+                "silex/silex": ">=1.0,<2.0"
            },
            "require-dev": {
-                "symfony/browser-kit": "~2.0"
+                "symfony/browser-kit": ">=2.0,<3.0"
            },
            "type": "library",
            "autoload": {
@@ -2968,7 +2957,7 @@
                "metadata"
            ],
            "support": {
-                "source": "https://github.com/alchemy-fr/PHPExiftool/tree/dev"
+                "source": "https://github.com/alchemy-fr/PHPExiftool/tree/0.4.1-mwg-metadata-copy"
            },
            "time": "2014-10-08 16:09:02"
        },
@@ -3026,12 +3015,12 @@
            "version": "v1.1.1",
            "source": {
                "type": "git",
-                "url": "https://github.com/fabpot/Pimple.git",
+                "url": "https://github.com/silexphp/Pimple.git",
                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                "shasum": ""
            },
@@ -3056,9 +3045,7 @@
            "authors": [
                {
                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                }
            ],
            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@@ -3563,7 +3550,7 @@
                },
                {
                    "name": "Phraseanet Team",
-                    "email": "info@alchemy.fr",
+                    "email": "support@alchemy.fr",
                    "homepage": "http://www.phraseanet.com/"
                }
            ],
@@ -3610,9 +3597,7 @@
            "authors": [
                {
                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                },
                {
                    "name": "Chris Corbyn"
@@ -3836,12 +3821,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig-extensions.git",
-                "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
+                "reference": "c0ab818595338dd5569369bfce2552d02cec5d50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
-                "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
+                "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50",
+                "reference": "c0ab818595338dd5569369bfce2552d02cec5d50",
                "shasum": ""
            },
            "require": {
@@ -3888,12 +3873,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc"
+                "reference": "8ce37115802e257a984a82d38254884085060024"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/42f758d9fe2146d1f0470604fc05ee43580873fc",
-                "reference": "42f758d9fe2146d1f0470604fc05ee43580873fc",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8ce37115802e257a984a82d38254884085060024",
+                "reference": "8ce37115802e257a984a82d38254884085060024",
                "shasum": ""
            },
            "require": {
@@ -4207,13 +4192,13 @@
            "version": "v1.6.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/Behat/Mink.git",
-                "reference": "090900a0049c441f1e072bbd837db4079b2250c5"
+                "url": "https://github.com/minkphp/Mink.git",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Mink/zipball/090900a0049c441f1e072bbd837db4079b2250c5",
-                "reference": "090900a0049c441f1e072bbd837db4079b2250c5",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/0769e6d9726c140a54dbf827a438c0f9912749fe",
+                "reference": "0769e6d9726c140a54dbf827a438c0f9912749fe",
                "shasum": ""
            },
            "require": {
@@ -4262,13 +4247,13 @@
            "version": "v1.2.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/Behat/MinkBrowserKitDriver.git",
-                "reference": "aed8f4a596b79014a75254c3e337511c33e38cbd"
+                "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
+                "reference": "63960c8fcad4529faad1ff33e950217980baa64c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/aed8f4a596b79014a75254c3e337511c33e38cbd",
-                "reference": "aed8f4a596b79014a75254c3e337511c33e38cbd",
+                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/63960c8fcad4529faad1ff33e950217980baa64c",
+                "reference": "63960c8fcad4529faad1ff33e950217980baa64c",
                "shasum": ""
            },
            "require": {
@@ -4368,13 +4353,13 @@
            "version": "v1.1.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/Behat/MinkGoutteDriver.git",
-                "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e"
+                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
+                "reference": "fa1b073b48761464feb0b05e6825da44b20118d8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
-                "reference": "2bf327b4166694ecaa8ae7f956cb6ae252ecf03e",
+                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8",
+                "reference": "fa1b073b48761464feb0b05e6825da44b20118d8",
                "shasum": ""
            },
            "require": {
@@ -4420,13 +4405,13 @@
            "version": "v1.2.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/Behat/MinkSelenium2Driver.git",
-                "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210"
+                "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
+                "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkSelenium2Driver/zipball/8018fee80bf6573f909ece3e0dfc07d0eb352210",
-                "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/bcf1b537de37db6db0822d9e7bd97e600fd7a476",
+                "reference": "bcf1b537de37db6db0822d9e7bd97e600fd7a476",
                "shasum": ""
            },
            "require": {
@@ -4479,12 +4464,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/FriendsOfPHP/Goutte.git",
-                "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625"
+                "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/794b196e76bdd37b5155cdecbad311f0a3b07625",
-                "reference": "794b196e76bdd37b5155cdecbad311f0a3b07625",
+                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/06a5451288ffddd204b10fa6c6f9ab2b86dd515d",
+                "reference": "06a5451288ffddd204b10fa6c6f9ab2b86dd515d",
                "shasum": ""
            },
            "require": {
@@ -4956,9 +4941,9 @@
    ],
    "aliases": [
        {
-            "alias": "0.6.1",
-            "alias_normalized": "0.6.1.0",
-            "version": "dev-0.6.1-flatten-layer",
+            "alias": "0.6.2",
+            "alias_normalized": "0.6.2.0",
+            "version": "dev-alchemy-0.6.2",
            "package": "imagine/imagine"
        },
        {
@@ -4973,7 +4958,6 @@
        "alchemy/task-manager": 20,
        "alchemy/zippy": 20,
        "imagine/imagine": 20,
-        "media-alchemyst/media-alchemyst": 20,
        "neutron/process-manager": 20,
        "phpexiftool/phpexiftool": 20,
        "silex/silex": 20,
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Application/Api.php
+++ b/lib/Alchemy/Phrasea/Application/Api.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Application/Root.php
+++ b/lib/Alchemy/Phrasea/Application/Root.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/AccountCreator.php
+++ b/lib/Alchemy/Phrasea/Authentication/AccountCreator.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Authenticator.php
+++ b/lib/Alchemy/Phrasea/Authentication/Authenticator.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Context.php
+++ b/lib/Alchemy/Phrasea/Authentication/Context.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.php
+++ b/lib/Alchemy/Phrasea/Authentication/Exception/AccountLockedException.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php
+++ b/lib/Alchemy/Phrasea/Authentication/Exception/AuthenticationException.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.php
+++ b/lib/Alchemy/Phrasea/Authentication/Exception/NotAuthenticatedException.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.php
+++ b/lib/Alchemy/Phrasea/Authentication/Exception/RequireCaptchaException.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Manager.php
+++ b/lib/Alchemy/Phrasea/Authentication/Manager.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
+++ b/lib/Alchemy/Phrasea/Authentication/PersistentCookie/Manager.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureManager.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/OldPasswordEncoder.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/PasswordEncoder.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/AbstractProvider.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Facebook.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Factory.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Factory.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Github.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Github.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/GooglePlus.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Linkedin.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/ProviderInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Identity.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Token/Token.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Twitter.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.php
+++ b/lib/Alchemy/Phrasea/Authentication/Provider/Viadeo.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.php
+++ b/lib/Alchemy/Phrasea/Authentication/ProvidersCollection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php
+++ b/lib/Alchemy/Phrasea/Authentication/SuggestionFinder.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/AttributeInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/Factory.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/Factory.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/MetaField.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/MetaField.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/Metadata.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/Metadata.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/Status.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/Status.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Attribute/Story.php
+++ b/lib/Alchemy/Phrasea/Border/Attribute/Story.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/AbstractChecker.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/CheckerInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Colorspace.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Colorspace.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Dimension.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Dimension.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Extension.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Extension.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Filename.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Filename.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/MediaType.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/MediaType.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Response.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Response.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/Sha256.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/Sha256.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Checker/UUID.php
+++ b/lib/Alchemy/Phrasea/Border/Checker/UUID.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.php
+++ b/lib/Alchemy/Phrasea/Border/CustomExtensionGuesser.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/File.php
+++ b/lib/Alchemy/Phrasea/Border/File.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Manager.php
+++ b/lib/Alchemy/Phrasea/Border/Manager.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Border;

 use Alchemy\Phrasea\Border\Checker\CheckerInterface;
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
+use Alchemy\Phrasea\Media\Subdef\OptionType\Boolean;
 use Alchemy\Phrasea\Metadata\Tag\TfArchivedate;
 use Alchemy\Phrasea\Metadata\Tag\TfQuarantine;
 use Alchemy\Phrasea\Metadata\Tag\TfBasename;
@@ -80,7 +81,7 @@ class Manager
     * @param  type           $forceBehavior Force a behavior, one of the self::FORCE_* constant
     * @return int            One of the self::RECORD_CREATED or self::LAZARET_CREATED constants
     */
-    public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null)
+    public function process(LazaretSession $session, File $file, $callable = null, $forceBehavior = null, $nosubdef = false)
    {
        $visa = $this->getVisa($file);

@@ -93,7 +94,7 @@ class Manager

            $this->addMediaAttributes($file);

-            $element = $this->createRecord($file);
+            $element = $this->createRecord($file, $nosubdef);

            $code = self::RECORD_CREATED;
        } else {
@@ -229,10 +230,9 @@ class Manager
     * @param  File           $file The package file
     * @return \record_adater
     */
-    protected function createRecord(File $file)
+    protected function createRecord(File $file, $nosubdef=false)
    {
        $element = \record_adapter::createFromFile($file, $this->app);
-
        $date = new \DateTime();

        $file->addAttribute(
@@ -303,7 +303,9 @@ class Manager

        $this->app['phraseanet.metadata-setter']->replaceMetadata($newMetadata, $element);

-        $element->rebuild_subdefs();
+        if(!$nosubdef) {
+            $element->rebuild_subdefs();
+        }
        $element->reindex();

        return $element;
--- a/lib/Alchemy/Phrasea/Border/MetaBagInterface.php
+++ b/lib/Alchemy/Phrasea/Border/MetaBagInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/MetaFieldsBag.php
+++ b/lib/Alchemy/Phrasea/Border/MetaFieldsBag.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/MetadataBag.php
+++ b/lib/Alchemy/Phrasea/Border/MetadataBag.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php
+++ b/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Border/Visa.php
+++ b/lib/Alchemy/Phrasea/Border/Visa.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/CLI.php
+++ b/lib/Alchemy/Phrasea/CLI.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/ApcCache.php
+++ b/lib/Alchemy/Phrasea/Cache/ApcCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/ArrayCache.php
+++ b/lib/Alchemy/Phrasea/Cache/ArrayCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/Cache.php
+++ b/lib/Alchemy/Phrasea/Cache/Cache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/Exception.php
+++ b/lib/Alchemy/Phrasea/Cache/Exception.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/Factory.php
+++ b/lib/Alchemy/Phrasea/Cache/Factory.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -46,7 +46,7 @@ class Factory
                $cache = $this->createMemcache($options);
                break;
            case 'memcached':
-            case 'memcachecached':
+            case 'memcachedcache':
                $cache = $this->createMemcached($options);
                break;
            case 'redis':
--- a/lib/Alchemy/Phrasea/Cache/Manager.php
+++ b/lib/Alchemy/Phrasea/Cache/Manager.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/MemcacheCache.php
+++ b/lib/Alchemy/Phrasea/Cache/MemcacheCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/MemcachedCache.php
+++ b/lib/Alchemy/Phrasea/Cache/MemcachedCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/RedisCache.php
+++ b/lib/Alchemy/Phrasea/Cache/RedisCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/WinCacheCache.php
+++ b/lib/Alchemy/Phrasea/Cache/WinCacheCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Cache/XcacheCache.php
+++ b/lib/Alchemy/Phrasea/Cache/XcacheCache.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php
+++ b/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
+++ b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -38,9 +38,6 @@ class BuildMissingSubdefs extends Command
        $n = 0;

        foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
-
-            $subdefStructure = $databox->get_subdef_structure();
-
            $sql = 'SELECT record_id FROM record WHERE parent_record_id = 0';
            $stmt = $databox->get_connection()->prepare($sql);
            $stmt->execute();
@@ -50,38 +47,14 @@ class BuildMissingSubdefs extends Command
            foreach ($rs as $row) {
                $record = $databox->get_record($row['record_id']);

-                try {
-                    $record->get_hd_file();
-                } catch (FileNotFoundException $e) {
-                    continue;
-                }
+                $wanted_subdefs = $record->get_missing_subdefs();

-                $group = $subdefStructure->getSubdefGroup($record->get_type());
+                if (count($wanted_subdefs) > 0) {
+                    $record->generate_subdefs($databox, $this->container, $wanted_subdefs);

-                if ($group) {
-                    foreach ($group as $subdef) {
-
-                        $todo = false;
-
-                        if ( ! $record->has_subdef($subdef->get_name())) {
-                            $todo = true;
-                        }
-                        if (in_array($subdef->get_name(), ['preview', 'thumbnail', 'thumbnailgif'])) {
-                            try {
-                                $sub = $record->get_subdef($subdef->get_name());
-                                if ( ! $sub->is_physically_present()) {
-                                    $todo = true;
-                                }
-                            } catch (\Exception_Media_SubdefNotFound $e) {
-                                $todo = true;
-                            }
-                        }
-
-                        if ($todo) {
-                            $this->container['subdef.generator']->generateSubdefs($record, [$subdef->get_name()]);
-                            $this->container['monolog']->addInfo("generate " . $subdef->get_name() . " for record " . $record->get_record_id());
-                            $n ++;
-                        }
+                    foreach ($wanted_subdefs as $subdef) {
+                        $this->container['monolog']->addInfo("generate " .$subdef . " for record " . $record->get_record_id());
+                        $n ++;
                    }
                }

--- a/lib/Alchemy/Phrasea/Command/BuildSubdefs.php
+++ b/lib/Alchemy/Phrasea/Command/BuildSubdefs.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2014 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Alchemy\Phrasea\Command;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\SQLParserUtils;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class BuildSubdefs extends Command
+{
+    /**
+     * Constructor
+     */
+    public function __construct($name = null)
+    {
+        parent::__construct($name);
+
+        $this->setDescription('Build subviews for given subview names and record types');
+        $this->addArgument('databox', InputArgument::REQUIRED, 'The databox id');
+        $this->addArgument('type', InputArgument::REQUIRED, 'Types of the document to rebuild');
+        $this->addArgument('subdefs', InputArgument::REQUIRED, 'Names of sub-definition to re-build');
+        $this->addOption('max_record', 'max', InputOption::VALUE_OPTIONAL, 'Max record id');
+        $this->addOption('min_record', 'min', InputOption::VALUE_OPTIONAL, 'Min record id');
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doExecute(InputInterface $input, OutputInterface $output)
+    {
+        $availableTypes = array('document', 'audio', 'video', 'image', 'flash', 'map');
+
+        $typesOption =  $input->getArgument('type');
+
+        $recordsType = explode(',', $typesOption);
+        $recordsType = array_filter($recordsType, function($type) use($availableTypes) {
+            return in_array($type, $availableTypes);
+        });
+
+        if (count($recordsType) === 0) {
+            $output->write(sprintf('Invalid records type provided %s', implode(', ', $availableTypes)));
+            return;
+        }
+
+        $subdefsOption = $input->getArgument('subdefs');
+        $subdefsName = explode(',', $subdefsOption);
+
+        if (count($subdefsOption) === 0) {
+            $output->write('No subdef options provided');
+            return;
+        }
+
+        $sqlCount = "
+            SELECT COUNT(DISTINCT(r.record_id)) AS nb_records
+            FROM record r
+            INNER JOIN subdef s
+            ON (r.record_id = s.record_id)
+            WHERE s.name IN (?)
+            AND r.type IN (?)
+        ";
+
+        $types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY);
+        $params = array($subdefsName, $recordsType);
+
+        if (null !== $min = $input->getOption('min_record')) {
+            $sqlCount .= " AND (r.record_id >= ?)";
+
+            $params[] = (int) $min;
+            $types[] = \PDO::PARAM_INT;
+        }
+        if (null !== $max = $input->getOption('max_record')) {
+            $sqlCount .= " AND (r.record_id <= ?)";
+
+            $params[] = (int) $max;
+            $types[] = \PDO::PARAM_INT;
+        }
+
+        list($sqlCount, $stmtParams) = SQLParserUtils::expandListParameters($sqlCount, $params, $types);
+
+        $totalRecords = 0;
+        foreach ($this->container['phraseanet.appbox']->get_databoxes() as $databox) {
+            $connection = $databox->get_connection();
+            $stmt = $connection->prepare($sqlCount);
+            $stmt->execute($stmtParams);
+            $row = $stmt->fetch();
+            $totalRecords += $row['nb_records'];
+        }
+
+        if ($totalRecords === 0) {
+            return;
+        }
+
+        $progress = $this->getHelperSet()->get('progress');
+
+        $progress->start($output, $totalRecords);
+
+        $progress->display();
+
+        $databox = $this->container['phraseanet.appbox']->get_databox($input->getArgument('databox'));
+
+        $sql = "
+            SELECT DISTINCT(r.record_id)
+            FROM record r
+            INNER JOIN subdef s
+            ON (r.record_id = s.record_id)
+            WHERE s.name IN (?)
+            AND r.type IN (?)
+        ";
+
+        $types = array(Connection::PARAM_STR_ARRAY, Connection::PARAM_STR_ARRAY);
+        $params = array($subdefsName, $recordsType);
+
+        if ($min) {
+            $sql .= " AND (r.record_id >= ?)";
+
+            $params[] = (int) $min;
+            $types[] = \PDO::PARAM_INT;
+        }
+        if ($max) {
+            $sql .= " AND (r.record_id <= ?)";
+
+            $params[] = (int) $max;
+            $types[] = \PDO::PARAM_INT;
+        }
+
+        list($sql, $stmtParams) = SQLParserUtils::expandListParameters($sql, $params, $types);
+
+        $connection = $databox->get_connection();
+        $stmt = $connection->prepare($sql);
+        $stmt->execute($stmtParams);
+        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+        foreach ($rows as $row) {
+            $output->write(sprintf(' (#%s)', $row['record_id']));
+
+            $record = new \record_adapter($this->container, $databox->get_sbas_id(), $row['record_id']);
+
+            $subdefs = array_filter($record->get_subdefs(), function($subdef) use ($subdefsName) {
+                return in_array($subdef->get_name(), $subdefsName);
+            });
+
+            foreach ($subdefs as $subdef) {
+                $subdef->remove_file();
+            }
+
+            $record->generate_subdefs($databox, $this->container, $subdefsName);
+
+            $stmt->closeCursor();
+
+            $progress->advance();
+        }
+
+        unset($rows, $record, $stmt, $connection);
+
+        $progress->finish();
+    }
+}
--- a/lib/Alchemy/Phrasea/Command/CheckConfig.php
+++ b/lib/Alchemy/Phrasea/Command/CheckConfig.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Command.php
+++ b/lib/Alchemy/Phrasea/Command/Command.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/CommandInterface.php
+++ b/lib/Alchemy/Phrasea/Command/CommandInterface.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Compile/Configuration.php
+++ b/lib/Alchemy/Phrasea/Command/Compile/Configuration.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/CreateCollection.php
+++ b/lib/Alchemy/Phrasea/Command/CreateCollection.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -39,8 +39,7 @@ class CreateCollection extends Command

    protected function doExecute(InputInterface $input, OutputInterface $output)
    {
-        $databox = $this->container['phraseanet.appbox']
-            ->get_databox((int) $input->getArgument('databox_id'));
+        $databox = $this->container['phraseanet.appbox']->get_databox((int) $input->getArgument('databox_id'));

        $new_collection = \collection::create($this->container, $databox, $this->container['phraseanet.appbox'], $input->getArgument('collname'));

--- a/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/APIRoutesDumper.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/AbstractRoutesDumper.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Behat.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Behat.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/BowerInstall.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/IniReset.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/IniReset.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/InstallAll.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/LessCompiler.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/RoutesDumper.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/SetupTestsDbs.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Uninstaller.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/BowerDriver.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/ComposerDriver.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/RecessDriver.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.php
+++ b/lib/Alchemy/Phrasea/Command/Developer/Utils/UglifyJsDriver.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/MailTest.php
+++ b/lib/Alchemy/Phrasea/Command/MailTest.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/AbstractPluginCommand.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/AddPlugin.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/ListPlugin.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php
+++ b/lib/Alchemy/Phrasea/Command/Plugin/RemovePlugin.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/lib/Alchemy/Phrasea/Command/RecordAdd.php
+++ b/lib/Alchemy/Phrasea/Command/RecordAdd.php
@@ -3,7 +3,7 @@
 /*
 * This file is part of Phraseanet
 *
- * (c) 2005-2014 Alchemy
+ * (c) 2005-2015 Alchemy
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/Show More
+++ b/Show More