diff --git a/composer.json b/composer.json index 6cd3438ba1..3f890de7d0 100644 --- a/composer.json +++ b/composer.json @@ -76,7 +76,7 @@ "php-ffmpeg/php-ffmpeg": "~0.5.0", "php-xpdf/php-xpdf": "~0.2.1", "phpexiftool/phpexiftool": "dev-0.4.1-mwg-metadata-copy as 0.4.1", - "rhumsaa/uuid": "~2.7", + "ramsey/uuid": "^3.0", "roave/security-advisories": "dev-master", "silex/silex": "~1.2", "silex/web-profiler": "~1.0", diff --git a/composer.lock b/composer.lock index 1e195bd202..344c323aa7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d463b8379eb7ddd0bc5d3fdb878a0c37", - "content-hash": "6d1bf999a101d0bbdcd5a8d3b94f4af4", + "hash": "7d9ab9ff4c9c0fecf882d499173503b0", + "content-hash": "227f7ac4b6e8fef6249111662d317932", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -3941,46 +3941,45 @@ "time": "2012-12-21 11:40:51" }, { - "name": "rhumsaa/uuid", - "version": "2.8.0", + "name": "ramsey/uuid", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/ramsey/rhumsaa-uuid.git", - "reference": "cca98c652cac412c9c2f109c69e5532f313435fc" + "url": "https://github.com/ramsey/uuid.git", + "reference": "3c84b9e2965a5fa666dec8617a3a66a8179c6ca8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/rhumsaa-uuid/zipball/cca98c652cac412c9c2f109c69e5532f313435fc", - "reference": "cca98c652cac412c9c2f109c69e5532f313435fc", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/3c84b9e2965a5fa666dec8617a3a66a8179c6ca8", + "reference": "3c84b9e2965a5fa666dec8617a3a66a8179c6ca8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.4" + }, + "replace": { + "rhumsaa/uuid": "self.version" }, "require-dev": { - "doctrine/dbal": ">=2.3", - "moontoast/math": "~1.1", - "phpunit/phpunit": "~4.1", - "satooshi/php-coveralls": "~0.6", - "symfony/console": "~2.3" + "apigen/apigen": "^4.1", + "ircmaxell/random-lib": "^1.1", + "jakub-onderka/php-parallel-lint": "^0.9.0", + "moontoast/math": "^1.1", + "phpunit/phpunit": "^4.7", + "satooshi/php-coveralls": "^0.6.1", + "squizlabs/php_codesniffer": "^2.3" }, "suggest": { - "doctrine/dbal": "Allow the use of a UUID as doctrine field type.", - "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).", - "symfony/console": "Support for use of the bin/uuid command line tool." + "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", + "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", + "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", + "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, - "bin": [ - "bin/uuid" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8.x-dev" - } - }, "autoload": { "psr-4": { - "Rhumsaa\\Uuid\\": "src/" + "Ramsey\\Uuid\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3992,20 +3991,24 @@ "name": "Marijn Huizendveld", "email": "marijn.huizendveld@gmail.com" }, + { + "name": "Thibaud Fabre", + "email": "thibaud@aztech.io" + }, { "name": "Ben Ramsey", - "homepage": "http://benramsey.com" + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" } ], - "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", + "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", "homepage": "https://github.com/ramsey/uuid", "keywords": [ "guid", "identifier", "uuid" ], - "abandoned": "ramsey/uuid", - "time": "2014-11-09 18:42:56" + "time": "2015-10-21 16:27:25" }, { "name": "roave/security-advisories", diff --git a/lib/Alchemy/Phrasea/Border/File.php b/lib/Alchemy/Phrasea/Border/File.php index 6721817878..5aac6344f1 100644 --- a/lib/Alchemy/Phrasea/Border/File.php +++ b/lib/Alchemy/Phrasea/Border/File.php @@ -12,20 +12,20 @@ namespace Alchemy\Phrasea\Border; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Border\Attribute\AttributeInterface; use Alchemy\Phrasea\Media\Type\Audio; use Alchemy\Phrasea\Media\Type\Document; use Alchemy\Phrasea\Media\Type\Flash; use Alchemy\Phrasea\Media\Type\Image; use Alchemy\Phrasea\Media\Type\Video; -use Alchemy\Phrasea\Border\Attribute\AttributeInterface; use Alchemy\Phrasea\Metadata\TagFactory; -use MediaVorus\Media\MediaInterface; use MediaVorus\Exception\FileNotFoundException; +use MediaVorus\Media\MediaInterface; use PHPExiftool\Driver\Metadata\Metadata; use PHPExiftool\Driver\Metadata\MetadataBag as ExiftoolMetadataBag; use PHPExiftool\Driver\Value\Mono as MonoValue; use PHPExiftool\Exception\ExceptionInterface as PHPExiftoolException; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; /** * Phraseanet candidate File package diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php index b90f181a08..b88cb035b5 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php @@ -13,7 +13,7 @@ namespace Alchemy\Phrasea\Command\Upgrade; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Border\File; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/lib/classes/Bridge/Api/Youtube.php b/lib/classes/Bridge/Api/Youtube.php index 8671600c9b..0df0cbabd9 100644 --- a/lib/classes/Bridge/Api/Youtube.php +++ b/lib/classes/Bridge/Api/Youtube.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Symfony\Component\HttpFoundation\Request; class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Interface diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php index 30eeacdbaf..4bd6bececd 100644 --- a/lib/classes/record/adapter.php +++ b/lib/classes/record/adapter.php @@ -37,7 +37,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Doctrine\ORM\EntityManager; use MediaVorus\Media\MediaInterface; use MediaVorus\MediaVorus; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Symfony\Component\HttpFoundation\File\File as SymfoFile; class record_adapter implements RecordInterface, cache_cacheableInterface diff --git a/tests/Alchemy/Tests/Phrasea/Border/FileTest.php b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php index 85bf37dd68..2a2279c794 100644 --- a/tests/Alchemy/Tests/Phrasea/Border/FileTest.php +++ b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php @@ -2,20 +2,20 @@ namespace Alchemy\Tests\Phrasea\Border; +use Alchemy\Phrasea\Border\Attribute\Metadata; use Alchemy\Phrasea\Border\File; -use Alchemy\Phrasea\Media\Type\Image; -use Alchemy\Phrasea\Media\Type\Flash; use Alchemy\Phrasea\Media\Type\Audio; -use Alchemy\Phrasea\Media\Type\Video; use Alchemy\Phrasea\Media\Type\Document; +use Alchemy\Phrasea\Media\Type\Flash; +use Alchemy\Phrasea\Media\Type\Image; +use Alchemy\Phrasea\Media\Type\Video; use MediaVorus\Media\MediaInterface; +use PHPExiftool\Driver\Metadata\Metadata as PHPExiftoolMetadata; +use PHPExiftool\Driver\Tag\IPTC\Keywords; use PHPExiftool\Driver\Tag\MXF\ObjectName; use PHPExiftool\Driver\Value\Mono; -use PHPExiftool\Driver\Tag\IPTC\Keywords; use PHPExiftool\Driver\Value\Multi; -use PHPExiftool\Driver\Metadata\Metadata as PHPExiftoolMetadata; -use Alchemy\Phrasea\Border\Attribute\Metadata; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; /** * @group functional diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php index f1a9d3e801..6699d41982 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php @@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Authentication\ACLProvider; use Alchemy\Phrasea\Border\File; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Symfony\Component\HttpKernel\Client; /** diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php index 95cbf93d34..74c1086fcc 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php @@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Border\File; -use Rhumsaa\Uuid\Uuid; +use Ramsey\Uuid\Uuid; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php index e7093ba2f3..864c736a31 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php @@ -3,11 +3,10 @@ namespace Alchemy\Tests\Phrasea\Controller\Api; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Authentication\Context; use Alchemy\Phrasea\Border\File; use Alchemy\Phrasea\Controller\Api\V1Controller; -use Alchemy\Phrasea\ControllerProvider\Api\V1; use Alchemy\Phrasea\Core\PhraseaEvents; -use Alchemy\Phrasea\Authentication\Context; use Alchemy\Phrasea\Model\Entities\ApiOauthToken; use Alchemy\Phrasea\Model\Entities\LazaretSession; use Alchemy\Phrasea\Model\Entities\Task; @@ -15,9 +14,9 @@ use Alchemy\Phrasea\Model\Entities\User; use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Doctrine\Common\Collections\ArrayCollection; use Guzzle\Common\Exception\GuzzleException; -use Rhumsaa\Uuid\Uuid; -use Symfony\Component\HttpKernel\Client; +use Ramsey\Uuid\Uuid; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Client; abstract class ApiTestCase extends \PhraseanetWebTestCase { diff --git a/tests/classes/record/adapterTest.php b/tests/classes/record/adapterTest.php index ffc7b21a0f..9728cb7da0 100644 --- a/tests/classes/record/adapterTest.php +++ b/tests/classes/record/adapterTest.php @@ -1,10 +1,9 @@