From 41b8f14394171b86889aae5598c7a98eb26fb7b8 Mon Sep 17 00:00:00 2001 From: Aken Roberts Date: Fri, 8 Nov 2019 19:03:39 -0600 Subject: [PATCH] Fix #1941 Change all string lengths to 191 chars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using a multibyte character set such as utf8mb4, the character length goes from 255 to 191. This resolves errors such as “specified key was too long” --- CHANGELOG.md | 5 +++-- src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php | 4 ++-- .../Entity/MappedSuperclass/AbstractTranslation.php | 2 +- tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php | 2 +- tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php | 2 +- tests/Gedmo/Loggable/Fixture/Entity/Address.php | 4 ++-- .../Mapping/Driver/Xml/Mapping.Fixture.Xml.Embedded.dcm.xml | 2 +- .../Xml/Mapping.Fixture.Xml.EmbeddedTranslatable.dcm.xml | 2 +- tests/Gedmo/Sluggable/Fixture/Page.php | 2 +- tests/Gedmo/Sortable/Fixture/AbstractNode.php | 4 ++-- tests/Gedmo/Sortable/Fixture/Category.php | 2 +- tests/Gedmo/Sortable/Fixture/Event.php | 2 +- tests/Gedmo/Sortable/Fixture/Item.php | 2 +- tests/Gedmo/Sortable/Fixture/SimpleListItem.php | 2 +- tests/Gedmo/Sortable/Fixture/Transport/Reservation.php | 4 ++-- tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php | 2 +- tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php | 6 +++--- tests/Gedmo/Tree/Fixture/Genealogy/Person.php | 2 +- tests/Gedmo/Tree/Fixture/Role.php | 2 +- tests/Gedmo/Tree/Fixture/UserGroup.php | 2 +- 20 files changed, 28 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755d6092a2..d8be94e327 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,8 +19,9 @@ a release. --- ## [Unreleased] -### Breaking Changes -- Change `/lib/Gedmo` to `/src` +### Notable & Breaking Changes +- Source files moved from `/lib/Gedmo` to `/src` +- All string column type annotations changed to 191 character length (#1941) ## [2.4.38] - 2019-11-08 ### Global / Shared diff --git a/src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php b/src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php index ba0c710e52..bf8ef88fa3 100644 --- a/src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php +++ b/src/Loggable/Entity/MappedSuperclass/AbstractLogEntry.php @@ -44,7 +44,7 @@ abstract class AbstractLogEntry /** * @var string $objectClass * - * @ORM\Column(name="object_class", type="string", length=255) + * @ORM\Column(name="object_class", type="string", length=191) */ protected $objectClass; @@ -65,7 +65,7 @@ abstract class AbstractLogEntry /** * @var string $data * - * @ORM\Column(length=255, nullable=true) + * @ORM\Column(length=191, nullable=true) */ protected $username; diff --git a/src/Translatable/Entity/MappedSuperclass/AbstractTranslation.php b/src/Translatable/Entity/MappedSuperclass/AbstractTranslation.php index 598f0cfdc7..0c5a2dc4ce 100644 --- a/src/Translatable/Entity/MappedSuperclass/AbstractTranslation.php +++ b/src/Translatable/Entity/MappedSuperclass/AbstractTranslation.php @@ -30,7 +30,7 @@ abstract class AbstractTranslation /** * @var string $objectClass * - * @ORM\Column(name="object_class", type="string", length=255) + * @ORM\Column(name="object_class", type="string", length=191) */ protected $objectClass; diff --git a/tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php b/tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php index fdd14ed584..c2dddfc88a 100644 --- a/tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php +++ b/tests/Gedmo/Blameable/Fixture/Entity/MappedSupperClass.php @@ -30,7 +30,7 @@ class MappedSupperClass * @var string $title * * @Gedmo\Translatable - * @ORM\Column(name="name", type="string", length=255) + * @ORM\Column(name="name", type="string", length=191) */ protected $name; diff --git a/tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php b/tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php index 39d4d4076f..bda1fbf79b 100644 --- a/tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php +++ b/tests/Gedmo/IpTraceable/Fixture/MappedSupperClass.php @@ -30,7 +30,7 @@ class MappedSupperClass * @var string $title * * @Gedmo\Translatable - * @ORM\Column(name="name", type="string", length=255) + * @ORM\Column(name="name", type="string", length=191) */ protected $name; diff --git a/tests/Gedmo/Loggable/Fixture/Entity/Address.php b/tests/Gedmo/Loggable/Fixture/Entity/Address.php index 2f77aef179..00ba14f026 100644 --- a/tests/Gedmo/Loggable/Fixture/Entity/Address.php +++ b/tests/Gedmo/Loggable/Fixture/Entity/Address.php @@ -25,14 +25,14 @@ class Address /** * @var string $street - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) * @Gedmo\Versioned() */ protected $street; /** * @var string $city - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) * @Gedmo\Versioned() */ protected $city; diff --git a/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.Embedded.dcm.xml b/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.Embedded.dcm.xml index 908a43b781..e360be67af 100644 --- a/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.Embedded.dcm.xml +++ b/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.Embedded.dcm.xml @@ -5,7 +5,7 @@ - + diff --git a/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.EmbeddedTranslatable.dcm.xml b/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.EmbeddedTranslatable.dcm.xml index 11bf2c8a45..1121b2360a 100644 --- a/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.EmbeddedTranslatable.dcm.xml +++ b/tests/Gedmo/Mapping/Driver/Xml/Mapping.Fixture.Xml.EmbeddedTranslatable.dcm.xml @@ -5,7 +5,7 @@ - + diff --git a/tests/Gedmo/Sluggable/Fixture/Page.php b/tests/Gedmo/Sluggable/Fixture/Page.php index 85cca97b8a..e837d13966 100644 --- a/tests/Gedmo/Sluggable/Fixture/Page.php +++ b/tests/Gedmo/Sluggable/Fixture/Page.php @@ -18,7 +18,7 @@ class Page private $id; /** - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ private $content; diff --git a/tests/Gedmo/Sortable/Fixture/AbstractNode.php b/tests/Gedmo/Sortable/Fixture/AbstractNode.php index 427ea9a2ee..e48721e9f2 100644 --- a/tests/Gedmo/Sortable/Fixture/AbstractNode.php +++ b/tests/Gedmo/Sortable/Fixture/AbstractNode.php @@ -18,13 +18,13 @@ class AbstractNode protected $id; /** - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ protected $name; /** * @Gedmo\SortableGroup - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ protected $path; diff --git a/tests/Gedmo/Sortable/Fixture/Category.php b/tests/Gedmo/Sortable/Fixture/Category.php index 7a6dda9a2b..0cdd1980f0 100644 --- a/tests/Gedmo/Sortable/Fixture/Category.php +++ b/tests/Gedmo/Sortable/Fixture/Category.php @@ -18,7 +18,7 @@ class Category private $id; /** - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ private $name; diff --git a/tests/Gedmo/Sortable/Fixture/Event.php b/tests/Gedmo/Sortable/Fixture/Event.php index 712eda6417..8c08502918 100644 --- a/tests/Gedmo/Sortable/Fixture/Event.php +++ b/tests/Gedmo/Sortable/Fixture/Event.php @@ -30,7 +30,7 @@ class Event /** * @var string * - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ private $name; diff --git a/tests/Gedmo/Sortable/Fixture/Item.php b/tests/Gedmo/Sortable/Fixture/Item.php index bc31308ee5..45685ef8dd 100644 --- a/tests/Gedmo/Sortable/Fixture/Item.php +++ b/tests/Gedmo/Sortable/Fixture/Item.php @@ -18,7 +18,7 @@ class Item private $id; /** - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ private $name; diff --git a/tests/Gedmo/Sortable/Fixture/SimpleListItem.php b/tests/Gedmo/Sortable/Fixture/SimpleListItem.php index 5ee4e5db5c..c3fa11026a 100644 --- a/tests/Gedmo/Sortable/Fixture/SimpleListItem.php +++ b/tests/Gedmo/Sortable/Fixture/SimpleListItem.php @@ -18,7 +18,7 @@ class SimpleListItem private $id; /** - * @ORM\Column(type="string", length=255) + * @ORM\Column(type="string", length=191) */ private $name; diff --git a/tests/Gedmo/Sortable/Fixture/Transport/Reservation.php b/tests/Gedmo/Sortable/Fixture/Transport/Reservation.php index 2d5abb6570..7d76e1d05a 100644 --- a/tests/Gedmo/Sortable/Fixture/Transport/Reservation.php +++ b/tests/Gedmo/Sortable/Fixture/Transport/Reservation.php @@ -26,7 +26,7 @@ class Reservation * Bus destination * * @Gedmo\SortableGroup - * @ORM\Column(length=255) + * @ORM\Column(length=191) */ private $destination; @@ -43,7 +43,7 @@ class Reservation private $seat; /** - * @ORM\Column(length=255) + * @ORM\Column(length=191) */ private $name; diff --git a/tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php b/tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php index 97144cc441..86bfd2fd7d 100644 --- a/tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php +++ b/tests/Gedmo/Timestampable/Fixture/MappedSupperClass.php @@ -30,7 +30,7 @@ class MappedSupperClass * @var string $title * * @Gedmo\Translatable - * @ORM\Column(name="name", type="string", length=255) + * @ORM\Column(name="name", type="string", length=191) */ protected $name; diff --git a/tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php b/tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php index a71dfc75af..32800232dd 100644 --- a/tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php +++ b/tests/Gedmo/Translatable/Fixture/CompanyEmbedLink.php @@ -13,7 +13,7 @@ class CompanyEmbedLink /** * @var string * - * @ORM\Column(name="website", type="string", length=255, nullable=true) + * @ORM\Column(name="website", type="string", length=191, nullable=true) * @Gedmo\Translatable */ protected $website; @@ -21,7 +21,7 @@ class CompanyEmbedLink /** * @var string * - * @ORM\Column(name="facebook", type="string", length=255, nullable=true) + * @ORM\Column(name="facebook", type="string", length=191, nullable=true) * @Gedmo\Translatable */ protected $facebook; @@ -64,4 +64,4 @@ public function setFacebook($facebook) return $this; } -} \ No newline at end of file +} diff --git a/tests/Gedmo/Tree/Fixture/Genealogy/Person.php b/tests/Gedmo/Tree/Fixture/Genealogy/Person.php index c2a5f0284a..50bde9f2cc 100644 --- a/tests/Gedmo/Tree/Fixture/Genealogy/Person.php +++ b/tests/Gedmo/Tree/Fixture/Genealogy/Person.php @@ -55,7 +55,7 @@ abstract class Person private $lvl; /** - * @ORM\Column(name="name", type="string", length=255, nullable=false) + * @ORM\Column(name="name", type="string", length=191, nullable=false) * @var string */ private $name; diff --git a/tests/Gedmo/Tree/Fixture/Role.php b/tests/Gedmo/Tree/Fixture/Role.php index 5988571a0b..546b651a02 100644 --- a/tests/Gedmo/Tree/Fixture/Role.php +++ b/tests/Gedmo/Tree/Fixture/Role.php @@ -55,7 +55,7 @@ abstract class Role private $lvl; /** - * @ORM\Column(name="role", type="string", length=255, nullable=false) + * @ORM\Column(name="role", type="string", length=191, nullable=false) * @var string */ private $role; diff --git a/tests/Gedmo/Tree/Fixture/UserGroup.php b/tests/Gedmo/Tree/Fixture/UserGroup.php index 265089ca4f..e2e9c4a225 100644 --- a/tests/Gedmo/Tree/Fixture/UserGroup.php +++ b/tests/Gedmo/Tree/Fixture/UserGroup.php @@ -12,7 +12,7 @@ class UserGroup extends Role { /** - * @ORM\Column(name="name", type="string", length=255) + * @ORM\Column(name="name", type="string", length=191) * @var string */ private $name;