From 15fb164c74785337c0b55e805ab5a3f2e10a57a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Thu, 7 May 2015 13:58:34 +0200
Subject: [PATCH] =?UTF-8?q?rhumsaa/uuid=20a=20=C3=A9t=C3=A9=20renomm=C3=A9?=
=?UTF-8?q?=20en=20ramsey/uuid=20(et=20les=20namespaces=20ont=20suivi).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Entity/Repository/UploadedFileRepository.php | 2 +-
Entity/UploadedFile.php | 2 +-
composer.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php
index a0821750..181dd284 100644
--- a/Entity/Repository/UploadedFileRepository.php
+++ b/Entity/Repository/UploadedFileRepository.php
@@ -96,7 +96,7 @@ class UploadedFileRepository extends EntityRepository implements FileManagerInte
if(!$id) {
return null;
}
- if(!is_string($id) || !\Rhumsaa\Uuid\Uuid::isValid($id)) {
+ if(!is_string($id) || !\Ramsey\Uuid\Uuid::isValid($id)) {
throw new \InvalidArgumentException(sprintf("Identifiant invalide: %s", (string)$id));
}
return $this->findOneById($id);
diff --git a/Entity/UploadedFile.php b/Entity/UploadedFile.php
index 9fbc398e..12a2ca6a 100644
--- a/Entity/UploadedFile.php
+++ b/Entity/UploadedFile.php
@@ -15,7 +15,7 @@ use Gaufrette\StreamMode;
use InvalidArgumentException;
use Irstea\FileUploadBundle\Model\UploadedFileInterface;
use Irstea\FileUploadBundle\Utils\MimeTypeIcon;
-use Rhumsaa\Uuid\Uuid;
+use Ramsey\Uuid\Uuid;
/**
* @ORM\Entity(repositoryClass="Irstea\FileUploadBundle\Entity\Repository\UploadedFileRepository")
diff --git a/composer.json b/composer.json
index c2192c80..5e26d441 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"sensio/framework-extra-bundle": "~3.0",
"irstea/theme-bundle": "~1.5",
"knplabs/knp-gaufrette-bundle": "0.1.*",
- "rhumsaa/uuid": "~2.8",
+ "ramsey/uuid": "~2.8",
"blueimp/jquery-file-upload": "~9.9",
"white-october/pagerfanta-bundle": "~1.0",
"willdurand/js-translation-bundle": "~2.2"
--
GitLab