Skip to content

Commit d961988

Browse files
committed
Merge branch 'release/v3'
2 parents 6ba95b4 + 65fea41 commit d961988

4 files changed

Lines changed: 20 additions & 12 deletions

File tree

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: php
22
warnings_are_errors: false
33

44
php:
5-
- 5.5
65
- 5.6
76
- 7.0
87
- nightly
@@ -17,10 +16,8 @@ matrix:
1716
include:
1817
- php: 5.6
1918
env: CS_FIXER=run
20-
- php: 5.5
21-
env: COMPOSER_FLAGS="--prefer-lowest"
2219
- php: 5.6
23-
env: SYMFONY_VERSION=2.7.*
20+
env: COMPOSER_FLAGS="--prefer-lowest"
2421
- php: 5.6
2522
env: SYMFONY_VERSION=2.8.*
2623
- php: 5.6
@@ -31,6 +28,7 @@ matrix:
3128
env: SYMFONY_VERSION="3.2.*@dev"
3229
allow_failures:
3330
- php: nightly
31+
- php: hhvm
3432
- env: SYMFONY_VERSION="3.2.*@dev"
3533

3634
sudo: false

README.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Languages: English, French, Russian, German and Spanish.
1111

1212
## Requirements
1313

14-
* PHP >= 5.5
14+
* PHP >= 5.6
1515
* Symfony ~2.8|~3.0
1616
* FOSUserBundle
1717
* Knp Paginator
@@ -22,7 +22,7 @@ Languages: English, French, Russian, German and Spanish.
2222

2323
| Ticket Bundle | Symfony | PHP |
2424
| ---------------------------------------------------------------------- | ---------- | ----- |
25-
| [3.x](https://github.com/hackzilla/TicketBundle/tree/master) (master) | ^2.8\|^3.0 | >=5.5 |
25+
| [3.x](https://github.com/hackzilla/TicketBundle/tree/master) (master) | ^2.8\|^3.0 | >=5.6 |
2626
| [2.x](https://github.com/hackzilla/TicketBundle/tree/2.x) | ^2.7\|^3.0 | >=5.3 |
2727
| [1.x](https://github.com/hackzilla/TicketBundle/tree/1.x) | ^2.3 | >=5.3 |
2828
| [0.x](https://github.com/hackzilla/TicketBundle/tree/0.9.x) | ^2.3 | >=5.3 |
@@ -50,15 +50,13 @@ TicketBundle show fires events for creating, updating, and deleting of tickets.
5050
See for example of how to create listener: http://symfony.com/doc/current/cookbook/service_container/event_listener.html
5151

5252

53-
## Migration from v2 to v3
54-
5553
Add your user, ticket and ticket message entities into your config.
5654

5755
```yaml
5856
hackzilla_ticket:
5957
user_class: AppBundle\Entity\User
60-
ticket_class: AppBundle\Entity\Ticket
61-
message_class: AppBundle\Entity\Message
58+
ticket_class: AppBundle\Entity\Ticket
59+
message_class: AppBundle\Entity\Message
6260
```
6361
6462
Your entities needs to implement:
@@ -69,8 +67,18 @@ Your entities needs to implement:
6967
| Ticket | ```Hackzilla\Bundle\TicketBundle\Model\MessageInterface``` |
7068
| Message | ```Hackzilla\Bundle\TicketBundle\Model\TicketMessageInterface``` |
7169

72-
Any reference to TicketMessage constants will need to use TicketMessageInterface.
70+
## Migration from v2 to v3
71+
72+
Ticket and TicketMessage entities still exist and the config will default to them if not overridden.
7373

74+
```yaml
75+
hackzilla_ticket:
76+
user_class: AppBundle\Entity\User
77+
ticket_class: Hackzilla\Bundle\TicketBundle\Entity\Ticket
78+
message_class: Hackzilla\Bundle\TicketBundle\Entity\TicketMessage
79+
```
80+
81+
Any reference to TicketMessage constants will need to use TicketMessageInterface.
7482

7583
## Migrating from v1 to v2
7684

Tests/bootstrap.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
putenv('SYMFONY_DEPRECATIONS_HELPER=weak');
4+
35
if (is_file('vendor/autoload.php')) {
46
include 'vendor/autoload.php';
57
} elseif (!is_file($autoloadFile = __DIR__.'/../vendor/autoload.php')) {

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
],
2727
"require": {
28-
"php": "^5.5 || ^7.0",
28+
"php": "^5.6 || ^7.0",
2929
"symfony/symfony": "^2.8 || ^3.0",
3030
"sensio/framework-extra-bundle": "^3.0.2",
3131
"doctrine/orm": "^2.4.8",

0 commit comments

Comments
 (0)