Skip to content

Commit ab348c7

Browse files
authored
Merge pull request #23 from jolicode/doctrine
Change the type of Seo Columns from string(255) to text
2 parents f0c37d4 + 73f5026 commit ab348c7

File tree

8 files changed

+19
-36
lines changed

8 files changed

+19
-36
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ before_script:
3131
script:
3232
- vendor/bin/simple-phpunit
3333
- if [ "$check_cs" = "true" ]; then vendor/bin/php-cs-fixer fix --config=.php_cs --dry-run --diff; fi;
34+
35+
branches:
36+
only:
37+
- master

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Changes between versions
22

3-
## Not yet released
3+
## 0.4.0 (2017-09-12)
4+
5+
* [BC BREAK][Doctrine] Change the type of Seo Columns from string(255) to text
6+
* [BC BREAK][Symfony] Remove Symfony Validator Asserts on Seo object
47

58
## 0.3.1 (2017-09-01)
69

src/Bridge/Doctrine/Resources/config/doctrine/Seo.orm.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,29 @@ Joli\SeoOverride\Bridge\Doctrine\Entity\Seo:
33
fields:
44
title:
55
column: title
6-
type: string
7-
length: 255
6+
type: text
87
nullable: true
98
description:
109
column: description
11-
type: string
12-
length: 255
10+
type: text
1311
nullable: true
1412
keywords:
1513
column: keywords
16-
type: string
17-
length: 255
14+
type: text
1815
nullable: true
1916
robots:
2017
column: robots
21-
type: string
22-
length: 255
18+
type: text
2319
nullable: true
2420
canonical:
2521
column: canonical
26-
type: string
27-
length: 255
22+
type: text
2823
nullable: true
2924
ogTitle:
3025
column: og_title
31-
type: string
32-
length: 255
26+
type: text
3327
nullable: true
3428
ogDescription:
3529
column: og_description
36-
type: string
37-
length: 255
30+
type: text
3831
nullable: true

src/Bridge/Doctrine/Resources/config/doctrine/SeoOverride.orm.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Joli\SeoOverride\Bridge\Doctrine\Entity\SeoOverride:
1313
fields:
1414
path:
1515
column: path
16-
type: string
17-
length: 255
16+
type: text
1817
domainAlias:
1918
column: domain_alias
2019
type: string

src/Bridge/Symfony/DataCollector/SeoOverrideDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getStatus()
5858

5959
public function getStatusLabel()
6060
{
61-
return $this->data['status'] === self::STATUS_MATCHED ? 'matched' : 'no match';
61+
return self::STATUS_MATCHED === $this->data['status'] ? 'matched' : 'no match';
6262
}
6363

6464
public function getVersions()

src/Bridge/Symfony/DependencyInjection/CompilerPass/RegisterFetcherPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function process(ContainerBuilder $container)
5353
$optionNormalized = $this->camelize($option);
5454
$index = array_search($optionNormalized, $arguments, true);
5555

56-
if ($index === false) {
56+
if (false === $index) {
5757
throw new LogicException(sprintf(
5858
'Unkown "%s" option for fetcher "%s"',
5959
$option,

src/Bridge/Symfony/Resources/config/validation.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Bridge/Symfony/Subscriber/SeoSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(SeoManagerInterface $seoManager)
3131

3232
public function onKernelResponse(FilterResponseEvent $event)
3333
{
34-
if ($event->getRequestType() === HttpKernelInterface::MASTER_REQUEST) {
34+
if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
3535
$path = $event->getRequest()->getPathInfo();
3636
$domain = $event->getRequest()->getHost();
3737

0 commit comments

Comments
 (0)